Refactoring -- Less submodules means less contraints to write explicitely