Changing from submodule to subtree
From submodule to subtree, the subtree-submodules may be finicky (currently stuck them in .gitmodules at root)