App divided into modules, added some routing, templates and structure change.