reorganized the project dir