Update application structure. Continue hacking on locomotive framework for initialization