Refactor app folder structure
Merge branch 'master' of https://github.com/JaWSnl/swoc2014