Refactored the application using the newly designed architecture