Include modules, refactoring main.js