refactoring of app
Merge pull request #2 from ehenneken/master

refactoring of app