Removing old submodule dirs

Old submodules will be placed directly in the repository