Moved code from controller to locationHandler service, added JSON files, changed views