Dispatch controllers in their own file + Minor fixes