Reaarange of the project structure