Change module files name to entities_data and add oop logic
Add module files name to entities_data and add oop logic