Change the project structure to make it easier to understand