Removed submodules
refactoring