remove submodules
add submodules in correct location