diff --git a/modules/lvm/LVM.pm b/modules/AIX/LVM.pm
similarity index 100%
rename from modules/lvm/LVM.pm
rename to modules/AIX/LVM.pm
diff --git a/modules/lvm/LVM/impex.pm b/modules/AIX/LVM/impex.pm
similarity index 100%
rename from modules/lvm/LVM/impex.pm
rename to modules/AIX/LVM/impex.pm
diff --git a/modules/lvm/LVM/lv.pm b/modules/AIX/LVM/lv.pm
similarity index 100%
rename from modules/lvm/LVM/lv.pm
rename to modules/AIX/LVM/lv.pm
diff --git a/modules/lvm/LVM/pv.pm b/modules/AIX/LVM/pv.pm
similarity index 100%
rename from modules/lvm/LVM/pv.pm
rename to modules/AIX/LVM/pv.pm
diff --git a/modules/lvm/LVM/tools.pm b/modules/AIX/LVM/tools.pm
similarity index 100%
rename from modules/lvm/LVM/tools.pm
rename to modules/AIX/LVM/tools.pm
diff --git a/modules/lvm/LVM/vg.pm b/modules/AIX/LVM/vg.pm
similarity index 100%
rename from modules/lvm/LVM/vg.pm
rename to modules/AIX/LVM/vg.pm
diff --git a/modules/nim/NIM/Config.pm b/modules/AIX/NIM/Config.pm
similarity index 100%
rename from modules/nim/NIM/Config.pm
rename to modules/AIX/NIM/Config.pm
diff --git a/modules/nim/NIM/Dashboard.pm b/modules/AIX/NIM/Dashboard.pm
similarity index 100%
rename from modules/nim/NIM/Dashboard.pm
rename to modules/AIX/NIM/Dashboard.pm
diff --git a/modules/nim/NIM/Object.pm b/modules/AIX/NIM/Object.pm
similarity index 100%
rename from modules/nim/NIM/Object.pm
rename to modules/AIX/NIM/Object.pm
diff --git a/modules/sw-maint/Catalog.pm b/modules/AIX/Software/Catalog.pm
similarity index 100%
rename from modules/sw-maint/Catalog.pm
rename to modules/AIX/Software/Catalog.pm
diff --git a/modules/sw-maint/Fileset.pm b/modules/AIX/Software/Fileset.pm
similarity index 100%
rename from modules/sw-maint/Fileset.pm
rename to modules/AIX/Software/Fileset.pm
diff --git a/modules/sw-maint/Maintenance.pm b/modules/AIX/Software/Maintenance.pm
similarity index 100%
rename from modules/sw-maint/Maintenance.pm
rename to modules/AIX/Software/Maintenance.pm
diff --git a/modules/sw-maint/Package.pm b/modules/AIX/Software/Package.pm
similarity index 100%
rename from modules/sw-maint/Package.pm
rename to modules/AIX/Software/Package.pm
diff --git a/modules/sw-maint/Template.pm b/modules/AIX/Software/Template.pm
similarity index 100%
rename from modules/sw-maint/Template.pm
rename to modules/AIX/Software/Template.pm
diff --git a/modules/sw-maint/bff_contents.pm b/modules/AIX/Software/bff_contents.pm
similarity index 100%
rename from modules/sw-maint/bff_contents.pm
rename to modules/AIX/Software/bff_contents.pm
diff --git a/modules/sw-maint/scripts/lsbff.pl b/modules/AIX/Software/scripts/lsbff.pl
similarity index 100%
rename from modules/sw-maint/scripts/lsbff.pl
rename to modules/AIX/Software/scripts/lsbff.pl
diff --git a/modules/sw-maint/scripts/readtoc.pl b/modules/AIX/Software/scripts/readtoc.pl
similarity index 100%
rename from modules/sw-maint/scripts/readtoc.pl
rename to modules/AIX/Software/scripts/readtoc.pl
diff --git a/modules/sw-maint/toc.pm b/modules/AIX/Software/toc.pm
similarity index 100%
rename from modules/sw-maint/toc.pm
rename to modules/AIX/Software/toc.pm
diff --git a/modules/sys-stanza/Stanza.pm b/modules/AIX/System/Stanza.pm
similarity index 100%
rename from modules/sys-stanza/Stanza.pm
rename to modules/AIX/System/Stanza.pm
diff --git a/modules/sys-vpd/.cvsignore b/modules/AIX/VPD/.cvsignore
similarity index 100%
rename from modules/sys-vpd/.cvsignore
rename to modules/AIX/VPD/.cvsignore
diff --git a/modules/sys-vpd/fcs.pm b/modules/AIX/VPD/fcs.pm
similarity index 100%
rename from modules/sys-vpd/fcs.pm
rename to modules/AIX/VPD/fcs.pm
diff --git a/modules/sys-vpd/lscfg.pm b/modules/AIX/VPD/lscfg.pm
similarity index 100%
rename from modules/sys-vpd/lscfg.pm
rename to modules/AIX/VPD/lscfg.pm
diff --git a/modules/sys-vpd/showvpd.pl b/modules/AIX/VPD/showvpd.pl
similarity index 100%
rename from modules/sys-vpd/showvpd.pl
rename to modules/AIX/VPD/showvpd.pl
diff --git a/modules/dev-atm/atm.pm b/modules/AIX/dev/atm.pm
similarity index 100%
rename from modules/dev-atm/atm.pm
rename to modules/AIX/dev/atm.pm
diff --git a/modules/fs/SSA_disks.pm b/modules/AIX/fs/SSA_disks.pm
similarity index 100%
rename from modules/fs/SSA_disks.pm
rename to modules/AIX/fs/SSA_disks.pm
diff --git a/modules/fs/vg.pm b/modules/AIX/fs/vg.pm
similarity index 100%
rename from modules/fs/vg.pm
rename to modules/AIX/fs/vg.pm
diff --git a/modules/odm/odm.pm b/modules/AIX/odm.pm
similarity index 100%
rename from modules/odm/odm.pm
rename to modules/AIX/odm.pm
diff --git a/modules/printer/printer.pm b/modules/AIX/printer.pm
similarity index 100%
rename from modules/printer/printer.pm
rename to modules/AIX/printer.pm