Started created modules to separate functionality.