remove full folders, move to submodules instead