Changing names from curriculum to courses
more progress in rename and clean up