diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/setup.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/setup.py
index 34e6bb59de5..22db82c0495 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS4630-54PE platforms',
    
    packages=['as4630_54pe'],
-   package_dir={'as4630_54pe': 'as4630-54pe/classes'},
+   package_dir={'as4630_54pe': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/setup.py b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/setup.py
index 78b45368c79..1c80604e941 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as4630-54te/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54te/setup.py
@@ -10,5 +10,5 @@
     description='Module to initialize Accton AS4630-54TE platforms',
 
     packages=['as4630_54te'],
-    package_dir={'as4630_54te': 'as4630-54te/classes'},
+    package_dir={'as4630_54te': 'classes'},
 )
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5712-54x/setup.py b/platform/broadcom/sonic-platform-modules-accton/as5712-54x/setup.py
index f4cb5f960a4..61356a299ba 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as5712-54x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5712-54x/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS5712-54X platforms',
    
    packages=['as5712_54x'],
-   package_dir={'as5712_54x': 'as5712-54x/classes'},
+   package_dir={'as5712_54x': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5812-54t/setup.py b/platform/broadcom/sonic-platform-modules-accton/as5812-54t/setup.py
index 0af58ba919b..b009e573b65 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as5812-54t/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5812-54t/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS5812-54X platforms',
    
    packages=['as5812_54t'],
-   package_dir={'as5812_54t': 'as5812-54t/classes'},
+   package_dir={'as5812_54t': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5812-54x/setup.py b/platform/broadcom/sonic-platform-modules-accton/as5812-54x/setup.py
index aa8615fd8a8..8a2c42eb5d7 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as5812-54x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5812-54x/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS5812-54X platforms',
    
    packages=['as5812_54x'],
-   package_dir={'as5812_54x': 'as5812-54x/classes'},
+   package_dir={'as5812_54x': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5835-54t/setup.py b/platform/broadcom/sonic-platform-modules-accton/as5835-54t/setup.py
index ac880c41e4e..d961724616f 100644
--- a/platform/broadcom/sonic-platform-modules-accton/as5835-54t/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5835-54t/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS5835-54T platforms',
    
    packages=['as5835_54t'],
-   package_dir={'as5835_54t': 'as5835-54t/classes'},
+   package_dir={'as5835_54t': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5835-54x/setup.py b/platform/broadcom/sonic-platform-modules-accton/as5835-54x/setup.py
index af0320318ea..8e8029a2574 100644
--- a/platform/broadcom/sonic-platform-modules-accton/as5835-54x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as5835-54x/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS5835-54X platforms',
    
    packages=['as5835_54x'],
-   package_dir={'as5835_54x': 'as5835-54x/classes'},
+   package_dir={'as5835_54x': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as6712-32x/setup.py b/platform/broadcom/sonic-platform-modules-accton/as6712-32x/setup.py
index 114b0837be6..28be6dfb88c 100644
--- a/platform/broadcom/sonic-platform-modules-accton/as6712-32x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as6712-32x/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS6712-32X platforms',
    
    packages=['as6712_32x'],
-   package_dir={'as6712_32x': 'as6712-32x/classes'},
+   package_dir={'as6712_32x': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7312-54x/setup.py b/platform/broadcom/sonic-platform-modules-accton/as7312-54x/setup.py
index 5e862ce1504..8840f0f1eda 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7312-54x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7312-54x/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS7312-54X platforms',
    
    packages=['as7312_54x'],
-   package_dir={'as7312_54x': 'as7312-54x/classes'},
+   package_dir={'as7312_54x': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/setup.py b/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/setup.py
index d1351ab3e59..4370c41f1d5 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS7312-54XS platforms',
    
    packages=['as7312_54xs'],
-   package_dir={'as7312_54xs': 'as7312-54xs/classes'},
+   package_dir={'as7312_54xs': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7315-27xb/setup.py b/platform/broadcom/sonic-platform-modules-accton/as7315-27xb/setup.py
index 09187900c7e..e17c72728ef 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7315-27xb/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7315-27xb/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS7315-27XB platforms',
    
    packages=['as7315_27xb'],
-   package_dir={'as7315_27xb': 'as7315-27xb/classes'},
+   package_dir={'as7315_27xb': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7326-56x/setup.py b/platform/broadcom/sonic-platform-modules-accton/as7326-56x/setup.py
index 77114c71285..3b81bee1c97 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7326-56x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7326-56x/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS7326-56X platforms',
    
    packages=['as7326_56x'],
-   package_dir={'as7326_56x': 'as7326-56x/classes'},
+   package_dir={'as7326_56x': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7712-32x/setup.py b/platform/broadcom/sonic-platform-modules-accton/as7712-32x/setup.py
index 09c763c84f0..8d7435bbf73 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7712-32x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7712-32x/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS7712-32X platforms',
    
    packages=['as7712_32x'],
-   package_dir={'as7712_32x': 'as7712-32x/classes'},
+   package_dir={'as7712_32x': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7716-32x/setup.py b/platform/broadcom/sonic-platform-modules-accton/as7716-32x/setup.py
index 7a3d784d326..be697951d9a 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7716-32x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7716-32x/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS7716-32X platforms',
    
    packages=['as7716_32x'],
-   package_dir={'as7716_32x': 'as7716-32x/classes'},
+   package_dir={'as7716_32x': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/setup.py b/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/setup.py
index 3edfc29b381..37debf8b163 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS7716-32XB platforms',
    
    packages=['as7716_32xb'],
-   package_dir={'as7716_32xb': 'as7716-32xb/classes'},
+   package_dir={'as7716_32xb': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/setup.py b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/setup.py
index 9841874dbd1..0c7d563297f 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS7726-32X platforms',
    
    packages=['as7726_32x'],
-   package_dir={'as7726_32x': 'as7726-32x/classes'},
+   package_dir={'as7726_32x': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as7816-64x/setup.py b/platform/broadcom/sonic-platform-modules-accton/as7816-64x/setup.py
index 6633b9438b8..bdfbe0c57f5 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as7816-64x/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as7816-64x/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS7816-64X platforms',
    
    packages=['as7816_64x'],
-   package_dir={'as7816_64x': 'as7816-64x/classes'},
+   package_dir={'as7816_64x': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9716-32d/setup.py b/platform/broadcom/sonic-platform-modules-accton/as9716-32d/setup.py
index 7c70492e5d6..f316de02288 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as9716-32d/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as9716-32d/setup.py
@@ -11,6 +11,6 @@
    description='Module to initialize Accton AS9716-32D platforms',
    
    packages=['as9716_32d'],
-   package_dir={'as9716_32d': 'as9716-32d/classes'},
+   package_dir={'as9716_32d': 'classes'},
 )
 
diff --git a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/setup.py b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/setup.py
index 7b84a9cab7e..bc6bad7edfd 100755
--- a/platform/broadcom/sonic-platform-modules-accton/as9726-32d/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/as9726-32d/setup.py
@@ -10,5 +10,5 @@
     description='Module to initialize Accton AS9726_32D platforms',
 
     packages=['as9726_32d'],
-    package_dir={'as9726_32d': 'as9726-32d/classes'},
+    package_dir={'as9726_32d': 'classes'},
 )
diff --git a/platform/broadcom/sonic-platform-modules-accton/debian/rules b/platform/broadcom/sonic-platform-modules-accton/debian/rules
index 8cd7611bb6e..43618ce379d 100755
--- a/platform/broadcom/sonic-platform-modules-accton/debian/rules
+++ b/platform/broadcom/sonic-platform-modules-accton/debian/rules
@@ -39,8 +39,8 @@ build:
 	#make modules -C $(KERNEL_SRC)/build M=$(MODULE_SRC)
 	(for mod in $(MODULE_DIRS); do \
 		make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
-		$(PYTHON3) $${mod}/setup.py build; \
 		cd $(MOD_SRC_DIR)/$${mod}; \
+		$(PYTHON3) setup.py build; \
 		if [ -f sonic_platform_setup.py ]; then \
 			$(PYTHON3) sonic_platform_setup.py bdist_wheel -d $(MOD_SRC_DIR)/$${mod}; \
 			echo "Finished makig whl package for $$mod"; \
@@ -72,7 +72,9 @@ binary-indep:
 		cp $(MOD_SRC_DIR)/$${mod}/$(MODULE_DIR)/*.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
 		cp $(MOD_SRC_DIR)/$${mod}/$(UTILS_DIR)/* debian/$(PACKAGE_PRE_NAME)-$${mod}/usr/local/bin/; \
 		cp $(MOD_SRC_DIR)/$${mod}/$(SERVICE_DIR)/*.service debian/$(PACKAGE_PRE_NAME)-$${mod}/lib/systemd/system/; \
-		$(PYTHON3) $${mod}/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \
+		cd $(MOD_SRC_DIR)/$${mod}; \
+		$(PYTHON3) setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \
+		cd -; \
 	done)
 	# Resuming debhelper scripts
 	dh_testroot
diff --git a/platform/broadcom/sonic-platform-modules-accton/minipack/setup.py b/platform/broadcom/sonic-platform-modules-accton/minipack/setup.py
index b5d08c090ba..ae350b71ba8 100755
--- a/platform/broadcom/sonic-platform-modules-accton/minipack/setup.py
+++ b/platform/broadcom/sonic-platform-modules-accton/minipack/setup.py
@@ -5,7 +5,7 @@
 from setuptools import setup, Extension
 os.listdir
 
-module1 = Extension("fbfpgaio", sources = ["minipack/lib/fbfpgaiomodule.c"])
+module1 = Extension("fbfpgaio", sources = ["lib/fbfpgaiomodule.c"])
 
 setup(
    name='minipack',
@@ -13,7 +13,7 @@
    description='Module to initialize Accton MiniPack platforms',
    
    packages=['minipack'],
-   package_dir={'minipack': 'minipack/classes'},
+   package_dir={'minipack': 'classes'},
    ext_modules=[module1],
    
 )