Re-arrange project structure