diff --git a/edk2basetools/FMMT/FMMT.py b/edk2basetools/FMMT/FMMT.py
index 29aec65f..6800a553 100644
--- a/edk2basetools/FMMT/FMMT.py
+++ b/edk2basetools/FMMT/FMMT.py
@@ -10,7 +10,7 @@
 # Import Modules
 #
 import argparse
-from core.FMMTOperation import *
+from edk2basetools.FMMT.core.FMMTOperation import *
 
 parser = argparse.ArgumentParser(description='''
 View the Binary Structure of FD/FV/Ffs/Section, and Delete/Extract/Add/Replace a Ffs from/into a FV.
diff --git a/edk2basetools/FMMT/core/BinaryFactoryProduct.py b/edk2basetools/FMMT/core/BinaryFactoryProduct.py
index 9eca6c19..c9b33e42 100644
--- a/edk2basetools/FMMT/core/BinaryFactoryProduct.py
+++ b/edk2basetools/FMMT/core/BinaryFactoryProduct.py
@@ -8,11 +8,11 @@
 import copy
 import os
 import sys
-from FirmwareStorageFormat.Common import *
-from core.BiosTreeNode import *
-from core.BiosTree import *
-from core.GuidTools import GUIDTools
-from utils.FmmtLogger import FmmtLogger as logger
+from edk2basetools.FirmwareStorageFormat.Common import *
+from edk2basetools.FMMT.core.BiosTreeNode import *
+from edk2basetools.FMMT.core.BiosTree import *
+from edk2basetools.FMMT.core.GuidTools import GUIDTools
+from edk2basetools.FMMT.utils.FmmtLogger import FmmtLogger as logger
 
 ROOT_TREE = 'ROOT'
 ROOT_ELF_TREE = 'ROOT_ELF_TREE'
diff --git a/edk2basetools/FMMT/core/BiosTree.py b/edk2basetools/FMMT/core/BiosTree.py
index f776519b..ca59fbbd 100644
--- a/edk2basetools/FMMT/core/BiosTree.py
+++ b/edk2basetools/FMMT/core/BiosTree.py
@@ -5,8 +5,8 @@
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
 import collections
-from FirmwareStorageFormat.Common import *
-from utils.FmmtLogger import FmmtLogger as logger
+from edk2basetools.FirmwareStorageFormat.Common import *
+from edk2basetools.FMMT.utils.FmmtLogger import FmmtLogger as logger
 
 ROOT_TREE = 'ROOT'
 ROOT_FV_TREE = 'ROOT_FV_TREE'
diff --git a/edk2basetools/FMMT/core/BiosTreeNode.py b/edk2basetools/FMMT/core/BiosTreeNode.py
index ba6a027c..860d8474 100644
--- a/edk2basetools/FMMT/core/BiosTreeNode.py
+++ b/edk2basetools/FMMT/core/BiosTreeNode.py
@@ -4,12 +4,12 @@
 # Copyright (c) 2021-, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
-from FirmwareStorageFormat.UPLHeader import *
-from FirmwareStorageFormat.FvHeader import *
-from FirmwareStorageFormat.FfsFileHeader import *
-from FirmwareStorageFormat.SectionHeader import *
-from FirmwareStorageFormat.Common import *
-from utils.FmmtLogger import FmmtLogger as logger
+from edk2basetools.FirmwareStorageFormat.UPLHeader import *
+from edk2basetools.FirmwareStorageFormat.FvHeader import *
+from edk2basetools.FirmwareStorageFormat.FfsFileHeader import *
+from edk2basetools.FirmwareStorageFormat.SectionHeader import *
+from edk2basetools.FirmwareStorageFormat.Common import *
+from edk2basetools.FMMT.utils.FmmtLogger import FmmtLogger as logger
 import uuid
 
 SectionHeaderType = {
diff --git a/edk2basetools/FMMT/core/FMMTOperation.py b/edk2basetools/FMMT/core/FMMTOperation.py
index d9ab6f69..0e8ad868 100644
--- a/edk2basetools/FMMT/core/FMMTOperation.py
+++ b/edk2basetools/FMMT/core/FMMTOperation.py
@@ -4,10 +4,10 @@
 # Copyright (c) 2021-, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
-from core.FMMTParser import *
-from core.FvHandler import *
-from utils.FvLayoutPrint import *
-from utils.FmmtLogger import FmmtLogger as logger
+from edk2basetools.FMMT.core.FMMTParser import *
+from edk2basetools.FMMT.core.FvHandler import *
+from edk2basetools.FMMT.utils.FvLayoutPrint import *
+from edk2basetools.FMMT.utils.FmmtLogger import FmmtLogger as logger
 
 global Fv_count
 Fv_count = 0
diff --git a/edk2basetools/FMMT/core/FMMTParser.py b/edk2basetools/FMMT/core/FMMTParser.py
index 18de96c0..f57909fd 100644
--- a/edk2basetools/FMMT/core/FMMTParser.py
+++ b/edk2basetools/FMMT/core/FMMTParser.py
@@ -4,12 +4,12 @@
 # Copyright (c) 2021-, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
-from FirmwareStorageFormat.Common import *
-from core.BinaryFactoryProduct import ParserEntry
-from core.BiosTreeNode import *
-from core.BiosTree import *
-from core.GuidTools import *
-from utils.FmmtLogger import FmmtLogger as logger
+from edk2basetools.FirmwareStorageFormat.Common import *
+from edk2basetools.FMMT.core.BinaryFactoryProduct import ParserEntry
+from edk2basetools.FMMT.core.BiosTreeNode import *
+from edk2basetools.FMMT.core.BiosTree import *
+from edk2basetools.FMMT.core.GuidTools import *
+from edk2basetools.FMMT.utils.FmmtLogger import FmmtLogger as logger
 
 class FMMTParser:
     def __init__(self, name: str, TYPE: str) -> None:
diff --git a/edk2basetools/FMMT/core/FvHandler.py b/edk2basetools/FMMT/core/FvHandler.py
index 207b7c97..9e939956 100644
--- a/edk2basetools/FMMT/core/FvHandler.py
+++ b/edk2basetools/FMMT/core/FvHandler.py
@@ -5,11 +5,11 @@
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
 import os
-from core.BiosTree import *
-from core.GuidTools import GUIDTools
-from core.BiosTreeNode import *
-from FirmwareStorageFormat.Common import *
-from utils.FmmtLogger import FmmtLogger as logger
+from edk2basetools.FMMT.core.BiosTree import *
+from edk2basetools.FMMT.core.GuidTools import GUIDTools
+from edk2basetools.FMMT.core.BiosTreeNode import *
+from edk2basetools.FirmwareStorageFormat.Common import *
+from edk2basetools.FMMT.utils.FmmtLogger import FmmtLogger as logger
 
 EFI_FVB2_ERASE_POLARITY = 0x00000800
 
diff --git a/edk2basetools/FMMT/core/GuidTools.py b/edk2basetools/FMMT/core/GuidTools.py
index 2509b183..b8b1bee1 100644
--- a/edk2basetools/FMMT/core/GuidTools.py
+++ b/edk2basetools/FMMT/core/GuidTools.py
@@ -11,8 +11,8 @@
 import sys
 import tempfile
 import uuid
-from FirmwareStorageFormat.Common import *
-from utils.FmmtLogger import FmmtLogger as logger
+from edk2basetools.FirmwareStorageFormat.Common import *
+from edk2basetools.FMMT.utils.FmmtLogger import FmmtLogger as logger
 import subprocess
 
 def ExecuteCommand(cmd: list) -> None:
diff --git a/edk2basetools/FMMT/utils/FvLayoutPrint.py b/edk2basetools/FMMT/utils/FvLayoutPrint.py
index f086d205..043d97d0 100644
--- a/edk2basetools/FMMT/utils/FvLayoutPrint.py
+++ b/edk2basetools/FMMT/utils/FvLayoutPrint.py
@@ -4,7 +4,7 @@
 # Copyright (c) 2021-, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
-from utils.FmmtLogger import FmmtLogger as logger
+from edk2basetools.FMMT.utils.FmmtLogger import FmmtLogger as logger
 
 def GetFormatter(layout_format: str):
     if layout_format == 'json':
@@ -52,4 +52,4 @@ def dump(self,layoutdict, layoutlist, outputfile = None):
 
 class HtmlFormatter(Formatter):
     def dump(self,layoutdict, layoutlist, outputfile = None):
-        TxtFormatter().dump(layoutdict, layoutlist, outputfile)
\ No newline at end of file
+        TxtFormatter().dump(layoutdict, layoutlist, outputfile)
diff --git a/edk2basetools/FirmwareStorageFormat/FfsFileHeader.py b/edk2basetools/FirmwareStorageFormat/FfsFileHeader.py
index b53b5d50..a7c76168 100644
--- a/edk2basetools/FirmwareStorageFormat/FfsFileHeader.py
+++ b/edk2basetools/FirmwareStorageFormat/FfsFileHeader.py
@@ -6,7 +6,7 @@
 ##
 from struct import *
 from ctypes import *
-from FirmwareStorageFormat.Common import *
+from edk2basetools.FirmwareStorageFormat.Common import *
 
 EFI_FFS_FILE_HEADER_LEN = 24
 EFI_FFS_FILE_HEADER2_LEN = 32
diff --git a/edk2basetools/FirmwareStorageFormat/FvHeader.py b/edk2basetools/FirmwareStorageFormat/FvHeader.py
index b084a3f0..a91515a8 100644
--- a/edk2basetools/FirmwareStorageFormat/FvHeader.py
+++ b/edk2basetools/FirmwareStorageFormat/FvHeader.py
@@ -7,7 +7,7 @@
 from ast import Str
 from struct import *
 from ctypes import *
-from FirmwareStorageFormat.Common import *
+from edk2basetools.FirmwareStorageFormat.Common import *
 
 class EFI_FV_BLOCK_MAP_ENTRY(Structure):
     _pack_ = 1
diff --git a/edk2basetools/FirmwareStorageFormat/SectionHeader.py b/edk2basetools/FirmwareStorageFormat/SectionHeader.py
index 155a4cd1..fdac134d 100644
--- a/edk2basetools/FirmwareStorageFormat/SectionHeader.py
+++ b/edk2basetools/FirmwareStorageFormat/SectionHeader.py
@@ -6,7 +6,7 @@
 ##
 from struct import *
 from ctypes import *
-from FirmwareStorageFormat.Common import *
+from edk2basetools.FirmwareStorageFormat.Common import *
 
 EFI_COMMON_SECTION_HEADER_LEN = 4
 EFI_COMMON_SECTION_HEADER2_LEN = 8
diff --git a/edk2basetools/FirmwareStorageFormat/UPLHeader.py b/edk2basetools/FirmwareStorageFormat/UPLHeader.py
index 06e73a11..b23bc2c2 100644
--- a/edk2basetools/FirmwareStorageFormat/UPLHeader.py
+++ b/edk2basetools/FirmwareStorageFormat/UPLHeader.py
@@ -6,7 +6,7 @@
 ##
 from struct import *
 from ctypes import *
-from FirmwareStorageFormat.Common import *
+from edk2basetools.FirmwareStorageFormat.Common import *
 
 EFI_COMMON_SECTION_HEADER_LEN = 4
 EFI_COMMON_SECTION_HEADER2_LEN = 8