Moved Modules to individual folders

There was no change in the modules, just moved their location