General cleanup, rename classes, remove unused
Handling case for Read only pluggables