Restructuring and compacting first part, mostly by rewriting contribution.
Merge branch 'master' of https://github.com/PhilZeppe/ICSOC-WESOA14