re-orgarnize the project