moved app classes and refactored