Refactor categories to be more semantic
Added more princples
Try to make more symantic categories