Restored the source folder, refactored
Merge branch 'master' of https://github.com/quinston/summative2013
ALL THE REFACTORING.