Changed submodules into proper directories