Switched to submodules referencing new GitHub repos