Move Custom Post Type and Taxonomies back to public class