This should be a submodule [part 1]
This should be a submodule [part 2]