Fixed labels
Pulled CPT and taxonomy creation into the main file