diff --git a/render_copy_settings/__init__.py b/render_copy_settings/__init__.py
index 0db084b7066d56f826c7675cd3fe3f98bcec7fac..30cd762d1f36444694b0320d85d3afa9a6057ab5 100644
--- a/render_copy_settings/__init__.py
+++ b/render_copy_settings/__init__.py
@@ -21,7 +21,7 @@
 bl_info = {
     "name": "Copy Settings",
     "author": "Bastien Montagne",
-    "version": (0, 1, 5),
+    "version": (0, 1, 6),
     "blender": (2, 65, 9),
     "location": "Render buttons (Properties window)",
     "description": "Allows to copy a selection of render settings "
@@ -90,27 +90,28 @@ class RenderCopySettings(bpy.types.PropertyGroup):
                                   default="")
 
 
+classes = (
+    RenderCopySettingsScene,
+    RenderCopySettingsSetting,
+    RenderCopySettings,
+) + operator.classes + panel.classes
+
+
 def register():
-    # Register properties.
-    bpy.utils.register_class(RenderCopySettingsScene)
-    bpy.utils.register_class(RenderCopySettingsSetting)
-    bpy.utils.register_class(RenderCopySettings)
+    for cls in classes:
+        bpy.utils.register_class(cls)
     bpy.types.Scene.render_copy_settings = PointerProperty(type=RenderCopySettings)
 
-    bpy.utils.register_module(__name__)
     bpy.app.translations.register(__name__, translations.translations_dict)
 
 
 def unregister():
-    # Unregister properties.
-    bpy.utils.unregister_class(RenderCopySettingsScene)
-    bpy.utils.unregister_class(RenderCopySettingsSetting)
-    bpy.utils.unregister_class(RenderCopySettings)
-    del bpy.types.Scene.render_copy_settings
-
-    bpy.utils.unregister_module(__name__)
     bpy.app.translations.unregister(__name__)
 
+    del bpy.types.Scene.render_copy_settings
+    for cls in classes:
+        bpy.utils.unregister_class(cls)
+
 
 if __name__ == "__main__":
     register()
diff --git a/render_copy_settings/operator.py b/render_copy_settings/operator.py
index 4f4c9954211e793c60b9772bb9a4c2f9e8b0cd68..13f98ed722f7444271326bbe638e6ca1a4b16e24 100644
--- a/render_copy_settings/operator.py
+++ b/render_copy_settings/operator.py
@@ -190,5 +190,11 @@ class RenderCopySettings(bpy.types.Operator):
         return {'FINISHED'}
 
 
+classes = (
+    RenderCopySettingsPrepare,
+    RenderCopySettingsPreset,
+    RenderCopySettings,
+)
+
 if __name__ == "__main__":
     bpy.ops.scene.render_copy_settings()
diff --git a/render_copy_settings/panel.py b/render_copy_settings/panel.py
index d91e8b0617a812c80cc9bedd35b1d0c5730e1690..6b182c1e8d58ff5e6472461e6af787c05ddb5295 100644
--- a/render_copy_settings/panel.py
+++ b/render_copy_settings/panel.py
@@ -81,3 +81,9 @@ class RENDER_PT_copy_settings(bpy.types.Panel):
                                  cp_sett, "allowed_scenes_idx", rows=6) # XXX Grid is not nice currently...
         else:
             layout.label(text="No Affectable Scenes!", icon="ERROR")
+
+
+classes = (
+    RENDER_UL_copy_settings,
+    RENDER_PT_copy_settings,
+)