Move controller to separate file