Fixed, filled up, cleaned up axiom.entity package