reorganized in to closure with modules declared in app.js