Updated to use 1 var for course folder

Also removed spaces in the code
Fix bug
Merge pull request #153 from zenduo/develop

Updated to use 1 var for course folder