reorganized the structure of the project