Reorganize project correctly