removing folders, will switch to submodules