Categorized and prepared to use stow
Added submodules back