rearranged the project structure