re-organization of the project