remove call to app in templates
Fix directory structure

Move static declaration