Structure overhaul to enable moduler nature