Reorganized controllers and services
Merge branch 'master' of github.com:fredriktid/CodeKeepr