Refactoring the application files