#18 Fix hq namespace in controllers