Move controller to right package