[=] Refactoring code into modules