Refactor the app classes structure
Merge branch 'master' of https://github.com/aspikirby/intersection