Re-arranging project structure