Made the listeners aware of the class of the wrapper.
Fixed a NPE when no listener was attached for listening to resource
creation.
Restructuring.