Removed submodules, will use git subtree instead