Reorganize project hierarchy