Merge pull request #414 from Hypolite/improvement/move-app-to-src