Transition to submodules - part 2