cleanup app. Move everything into services and custom directives