Refactored to modules, removed unnecessary App class