Added CopyResourcesListener (and cleaned up some other areas)