Restructure editing property-classes to have no built-in properties and to have fields for labels and comments once properties are chosen.