\r
import Common.EdkLogger as EdkLogger\r
import Common.GlobalData as GlobalData\r
-import EccGlobalData\r
-import EccToolError\r
+import Ecc.EccGlobalData as EccGlobalData\r
+import Ecc.EccToolError as EccToolError\r
\r
from CommonDataClass.DataClass import *\r
from Common.DataType import *\r
from Common.Expression import *\r
from CommonDataClass.Exceptions import *\r
\r
-from .MetaFileTable import MetaFileStorage\r
+from Ecc.MetaFileWorkspace.MetaFileTable import MetaFileStorage\r
from GenFds.FdfParser import FdfParser\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
from Common.LongFilePathSupport import CodecOpenLongFilePath\r