Renamed entities; Added ContactCategoryDao and Impl