Controllers services directives for the win
Bit flexbox stuff
Fixed conflict
Updated mobile app to new folder structure