Re-arrange project