shifted the deprecated class to the correct location
applied some fitering on the fields