Refactoring the project, new folders for view and model classes. Added