removed submodules
readded subdirectories