Refactoring our code into submodules