Project reorganize