Removed submodule structure; Going with merged subtree