Refactored application controller

- moved all freebase calls into service
- added logic in routs
- fixed merge conflicts