Added joke-service, restructure controllers