renamed controller and model to hyrise