Separated Ressource and Scaffold Generators in a more OO way
Merge branch 'cleaning'