Discard use of submodules yet.

Leave it for another time and then investigate how submodules apply.