Transition to submodules - part 3