refacto APP
Merge pull request #623 from arnaudbey/refacto-qroc

refacto APP