Moved Category.h/Category.m to Data source folder