adjust the project's structure for easier to read