reworking app for yeoman structure