Cfy 1185 remove plugin inheritance

organize imports