removed some submodules
Added some modules