Massively reorganized entity class structure