Reorganized Module Structure and added ‘Core’ module handling