Added templating, moved storage to app/