Comment by eterm

I'm not a fan of submodules, but indeed that also solves the problem OP described.