Changed git modules paths
Moved under src
Removed submodules
Added submodules back