Added services package, fixed CategotyEntity mapping