reorganise code
keeps custom post type and add category