Remove folders, will replace with submodules