Changed the module organization