Reordered functions into submodules (idea Bouke #5)