Major restructuring as per Linh's suggestion
Merge branch 'master' of https://github.com/PhilZeppe/ICSOC-WESOA14