Refactor default targets, add submodules target