fix and reorganize project folders