Reorganize project folder structure