Merge hotfix-reorganize (#13) into master

Reorganize flask application.

This will clean up the general structure of the
application and thus make development easier.
Add whitespace.
Merge branch 'master' into stable