Removing some folders in preparation for their submodule replacements