Start re-factoring custom post type and options files