Doing a little refactoring, separated modules into separate files