Moved categories header files