Reorganize project tree