Un-submodule submodules
Add modules again as plain files