Move controller related types to a separate package