transformed the rest_item.inc and rest_query.inc into a single module named oop_entity