Improving the organization of the application