move script directories for internal blender scripts.

ui/ --> startup/bl_ui
op/ --> startup/bl_operators

scripts/startup/ is now the only auto-loading script dir which gives some speedup for blender loading too.

~/.blender/2.56/scripts/startup works for auto-loading scripts too.

66 files changed, 233 insertions, 857 deletions

diff --git a/release/scripts/modules/bpy/__init__.py b/release/scripts/modules/bpy/__init__.py
index ed7b4baa806..efb1cf5c435 100644
--- a/release/scripts/modules/bpy/__init__.py
+++ b/release/scripts/modules/bpy/__init__.py
@@ -53,5 +53,65 @@ def _main():
     else:
         utils.load_scripts()
 
+    import os
+
+    # test for X11
+    if os.environ.get("DISPLAY"):
+
+        # BSD licenced code copied from python, temp fix for bug
+        # http://bugs.python.org/issue11432, XXX == added code
+        def _invoke(self, args, remote, autoraise):
+            # XXX, added imports
+            import io
+            import subprocess
+            import time
+
+            raise_opt = []
+            if remote and self.raise_opts:
+                # use autoraise argument only for remote invocation
+                autoraise = int(autoraise)
+                opt = self.raise_opts[autoraise]
+                if opt:
+                    raise_opt = [opt]
+
+            cmdline = [self.name] + raise_opt + args
+
+            if remote or self.background:
+                inout = io.open(os.devnull, "r+")
+            else:
+                # for TTY browsers, we need stdin/out
+                inout = None
+            # if possible, put browser in separate process group, so
+            # keyboard interrupts don't affect browser as well as Python
+            setsid = getattr(os, 'setsid', None)
+            if not setsid:
+                setsid = getattr(os, 'setpgrp', None)
+
+            p = subprocess.Popen(cmdline, close_fds=True,  # XXX, stdin=inout,
+                                 stdout=(self.redirect_stdout and inout or None),
+                                 stderr=inout, preexec_fn=setsid)
+            if remote:
+                # wait five secons. If the subprocess is not finished, the
+                # remote invocation has (hopefully) started a new instance.
+                time.sleep(1)
+                rc = p.poll()
+                if rc is None:
+                    time.sleep(4)
+                    rc = p.poll()
+                    if rc is None:
+                        return True
+                # if remote call failed, open() will try direct invocation
+                return not rc
+            elif self.background:
+                if p.poll() is None:
+                    return True
+                else:
+                    return False
+            else:
+                return not p.wait()
+
+        import webbrowser
+        webbrowser.UnixBrowser._invoke = _invoke
+
 
 _main()
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py
index 32f3a397a94..8f1fdc28402 100644
--- a/release/scripts/modules/bpy/utils.py
+++ b/release/scripts/modules/bpy/utils.py
@@ -185,7 +185,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
     user_path = user_script_path()
 
     for base_path in script_paths():
-        for path_subdir in ("", "ui", "op", "io", "keyingsets", "modules"):
+        for path_subdir in ("startup", "modules"):
             path = _os.path.join(base_path, path_subdir)
             if _os.path.isdir(path):
                 _sys_path_ensure(path)
diff --git a/release/scripts/op/console_python.py b/release/scripts/modules/console_python.py
index 4a2eb833d83..c25103e740c 100644
--- a/release/scripts/op/console_python.py
+++ b/release/scripts/modules/console_python.py
@@ -304,15 +304,3 @@ def banner(context):
     sc.prompt = PROMPT
 
     return {'FINISHED'}
-
-
-def register():
-    pass
-
-
-def unregister():
-    pass
-
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/console_shell.py b/release/scripts/modules/console_shell.py
index 2c5b48acd34..7a6f45c426f 100644
--- a/release/scripts/op/console_shell.py
+++ b/release/scripts/modules/console_shell.py
@@ -76,14 +76,3 @@ def banner(context):
     sc.prompt = os.getcwd() + PROMPT
 
     return {'FINISHED'}
-
-
-def register():
-    pass
-
-
-def unregister():
-    pass
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/add_mesh_torus.py b/release/scripts/startup/bl_operators/add_mesh_torus.py
index ab2163c9ac6..460330a56a1 100644
--- a/release/scripts/op/add_mesh_torus.py
+++ b/release/scripts/startup/bl_operators/add_mesh_torus.py
@@ -136,20 +136,3 @@ class AddTorus(bpy.types.Operator):
         add_object_utils.object_data_add(context, mesh, operator=self)
 
         return {'FINISHED'}
-
-
-def menu_func(self, context):
-    self.layout.operator(AddTorus.bl_idname, text="Torus", icon='MESH_TORUS')
-
-
-def register():
-    bpy.utils.register_class(AddTorus)
-    bpy.types.INFO_MT_mesh_add.append(menu_func)
-
-
-def unregister():
-    bpy.utils.unregister_class(AddTorus)
-    bpy.types.INFO_MT_mesh_add.remove(menu_func)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/animsys_update.py b/release/scripts/startup/bl_operators/animsys_update.py
index 9262ff40a37..eb14ab7eb72 100644
--- a/release/scripts/op/animsys_update.py
+++ b/release/scripts/startup/bl_operators/animsys_update.py
@@ -694,15 +694,3 @@ class UpdateAnimData(bpy.types.Operator):
         import animsys_refactor
         animsys_refactor.update_data_paths(data_path_update)
         return {'FINISHED'}
-
-
-if __name__ == "__main__":
-    bpy.ops.anim.update_data_paths()
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
diff --git a/release/scripts/op/fcurve_euler_filter.py b/release/scripts/startup/bl_operators/fcurve_euler_filter.py
index a6d5289d6f8..c7b249a1d0c 100644
--- a/release/scripts/op/fcurve_euler_filter.py
+++ b/release/scripts/startup/bl_operators/fcurve_euler_filter.py
@@ -76,14 +76,3 @@ class DiscontFilterOp(bpy.types.Operator):
     def execute(self, context):
         main(context)
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/image.py b/release/scripts/startup/bl_operators/image.py
index 67188e9c5fb..82e631e31d2 100644
--- a/release/scripts/op/image.py
+++ b/release/scripts/startup/bl_operators/image.py
@@ -187,14 +187,3 @@ class ProjectApply(bpy.types.Operator):
         bpy.ops.paint.project_image(image=image_name)
 
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/mesh.py b/release/scripts/startup/bl_operators/mesh.py
index 87adb37f886..a37a83f0f09 100644
--- a/release/scripts/op/mesh.py
+++ b/release/scripts/startup/bl_operators/mesh.py
@@ -170,14 +170,3 @@ class MeshMirrorUV(bpy.types.Operator):
             bpy.ops.object.mode_set(mode='EDIT', toggle=False)
 
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/nla.py b/release/scripts/startup/bl_operators/nla.py
index 284c6ca354c..923ca92a162 100644
--- a/release/scripts/op/nla.py
+++ b/release/scripts/startup/bl_operators/nla.py
@@ -168,18 +168,3 @@ class BakeAction(bpy.types.Operator):
     def invoke(self, context, event):
         wm = context.window_manager
         return wm.invoke_props_dialog(self)
-
-
-#def menu_func(self, context):
-#    self.layout.operator(BakeAction.bl_idname, text="Bake Armature Action")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/object.py b/release/scripts/startup/bl_operators/object.py
index 7b39281c7b0..db5eaccfc8f 100644
--- a/release/scripts/op/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -561,14 +561,3 @@ class ClearAllRestrictRender(bpy.types.Operator):
         for obj in context.scene.objects:
             obj.hide_render = False
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/object_align.py b/release/scripts/startup/bl_operators/object_align.py
index 4dd4ebd78ff..644f30a4745 100644
--- a/release/scripts/op/object_align.py
+++ b/release/scripts/startup/bl_operators/object_align.py
@@ -278,23 +278,3 @@ class AlignObjects(bpy.types.Operator):
             return {'CANCELLED'}
         else:
             return {'FINISHED'}
-
-
-def menu_func(self, context):
-    if context.mode == 'OBJECT':
-        self.layout.operator(AlignObjects.bl_idname,
-        text="Align Objects")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-    bpy.types.VIEW3D_MT_transform.append(menu_func)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-    bpy.types.VIEW3D_MT_transform.remove(menu_func)
-
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/object_randomize_transform.py b/release/scripts/startup/bl_operators/object_randomize_transform.py
index bd24d3833d5..d72c600ef78 100644
--- a/release/scripts/op/object_randomize_transform.py
+++ b/release/scripts/startup/bl_operators/object_randomize_transform.py
@@ -145,23 +145,3 @@ class RandomizeLocRotSize(bpy.types.Operator):
         randomize_selected(seed, delta, loc, rot, scale, scale_even)
 
         return {'FINISHED'}
-
-
-def menu_func(self, context):
-    if context.mode == 'OBJECT':
-        self.layout.operator(RandomizeLocRotSize.bl_idname,
-        text="Randomize Transform")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-    bpy.types.VIEW3D_MT_transform.append(menu_func)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-    bpy.types.VIEW3D_MT_transform.remove(menu_func)
-
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/presets.py b/release/scripts/startup/bl_operators/presets.py
index 65653aeee3e..e6f71ef9573 100644
--- a/release/scripts/op/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -351,14 +351,3 @@ class WM_MT_operator_presets(bpy.types.Menu):
         return AddPresetOperator.operator_path(self.operator)
 
     preset_operator = "script.execute_preset"
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/screen_play_rendered_anim.py b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
index 4c28f352164..64af25e7b0f 100644
--- a/release/scripts/op/screen_play_rendered_anim.py
+++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
@@ -140,14 +140,3 @@ class PlayRenderedAnim(bpy.types.Operator):
             #raise OSError("Couldn't find an external animation player.")
 
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/sequencer.py b/release/scripts/startup/bl_operators/sequencer.py
index 45a27154d84..16b72406c49 100644
--- a/release/scripts/op/sequencer.py
+++ b/release/scripts/startup/bl_operators/sequencer.py
@@ -132,15 +132,3 @@ class SequencerDeinterlaceSelectedMovies(bpy.types.Operator):
                 s.use_deinterlace = True
 
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/uvcalc_follow_active.py b/release/scripts/startup/bl_operators/uvcalc_follow_active.py
index 1b7a9292d03..ad5ec15ff80 100644
--- a/release/scripts/op/uvcalc_follow_active.py
+++ b/release/scripts/startup/bl_operators/uvcalc_follow_active.py
@@ -248,22 +248,3 @@ class FollowActiveQuads(bpy.types.Operator):
     def invoke(self, context, event):
         wm = context.window_manager
         return wm.invoke_props_dialog(self)
-
-
-def menu_func(self, context):
-    self.layout.operator_context = 'INVOKE_REGION_WIN'
-    self.layout.operator(FollowActiveQuads.bl_idname)
-
-
-def register():
-    bpy.utils.register_module(__name__)
-    bpy.types.VIEW3D_MT_uv_map.append(menu_func)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-    bpy.types.VIEW3D_MT_uv_map.remove(menu_func)
-
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py
index b7c48cf149b..fedc8b15161 100644
--- a/release/scripts/op/uvcalc_lightmap.py
+++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py
@@ -580,28 +580,3 @@ class LightMapPack(bpy.types.Operator):
     def invoke(self, context, event):
         wm = context.window_manager
         return wm.invoke_props_dialog(self)
-
-
-def menu_func(self, context):
-    self.layout.operator_context = 'INVOKE_REGION_WIN'
-    self.layout.operator(LightMapPack.bl_idname)
-
-
-def register():
-    bpy.utils.register_class(LightMapPack)
-    bpy.types.VIEW3D_MT_uv_map.append(menu_func)
-
-
-def unregister():
-    bpy.utils.register_class(LightMapPack)
-    bpy.types.VIEW3D_MT_uv_map.remove(menu_func)
-
-
-if __name__ == "__main__":
-    register()
-
-    '''
-    bpy.ops.import_scene.obj(filepath="/untitled.obj")
-    bpy.ops.uv.lightmap_pack(PREF_NEW_UVLAYER=1, PREF_APPLY_IMAGE=1, PREF_PACK_IN_ONE=1, PREF_CONTEXT='ALL_OBJECTS')
-    bpy.ops.wm.save_mainfile(filepath="/untitled.blend", check_existing=False)
-    '''
diff --git a/release/scripts/op/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
index dd5fe2c7e4c..4f5b1d8b233 100644
--- a/release/scripts/op/uvcalc_smart_project.py
+++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
@@ -1139,21 +1139,3 @@ class SmartProject(bpy.types.Operator):
     def invoke(self, context, event):
         wm = context.window_manager
         return wm.invoke_props_dialog(self)
-
-
-def menu_func(self, context):
-    self.layout.operator_context = 'INVOKE_REGION_WIN'
-    self.layout.operator(SmartProject.bl_idname, text="Smart Project")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-    bpy.types.VIEW3D_MT_uv_map.append(menu_func)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-    bpy.types.VIEW3D_MT_uv_map.remove(menu_func)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/vertexpaint_dirt.py b/release/scripts/startup/bl_operators/vertexpaint_dirt.py
index 8795355d168..ca8a3dedd0d 100644
--- a/release/scripts/op/vertexpaint_dirt.py
+++ b/release/scripts/startup/bl_operators/vertexpaint_dirt.py
@@ -146,7 +146,6 @@ from bpy.props import FloatProperty, IntProperty, BoolProperty
 
 
 class VertexPaintDirt(bpy.types.Operator):
-
     bl_idname = "paint.vertex_color_dirt"
     bl_label = "Dirty Vertex Colors"
     bl_options = {'REGISTER', 'UNDO'}
@@ -175,14 +174,3 @@ class VertexPaintDirt(bpy.types.Operator):
         print('Dirt calculated in %.6f' % (time.time() - t))
 
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/op/wm.py b/release/scripts/startup/bl_operators/wm.py
index 795e9c6148a..7e73fa7b647 100644
--- a/release/scripts/op/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -846,74 +846,3 @@ class WM_OT_sysinfo(bpy.types.Operator):
         import sys_info
         sys_info.write_sysinfo(self)
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-    import os
-
-    # test for X11
-    if os.environ.get("DISPLAY"):
-
-        # BSD licenced code copied from python, temp fix for bug
-        # http://bugs.python.org/issue11432, XXX == added code
-        def _invoke(self, args, remote, autoraise):
-            # XXX, added imports
-            import io
-            import subprocess
-            import time
-
-            raise_opt = []
-            if remote and self.raise_opts:
-                # use autoraise argument only for remote invocation
-                autoraise = int(autoraise)
-                opt = self.raise_opts[autoraise]
-                if opt:
-                    raise_opt = [opt]
-
-            cmdline = [self.name] + raise_opt + args
-
-            if remote or self.background:
-                inout = io.open(os.devnull, "r+")
-            else:
-                # for TTY browsers, we need stdin/out
-                inout = None
-            # if possible, put browser in separate process group, so
-            # keyboard interrupts don't affect browser as well as Python
-            setsid = getattr(os, 'setsid', None)
-            if not setsid:
-                setsid = getattr(os, 'setpgrp', None)
-
-            p = subprocess.Popen(cmdline, close_fds=True,  # XXX, stdin=inout,
-                                 stdout=(self.redirect_stdout and inout or None),
-                                 stderr=inout, preexec_fn=setsid)
-            if remote:
-                # wait five secons. If the subprocess is not finished, the
-                # remote invocation has (hopefully) started a new instance.
-                time.sleep(1)
-                rc = p.poll()
-                if rc is None:
-                    time.sleep(4)
-                    rc = p.poll()
-                    if rc is None:
-                        return True
-                # if remote call failed, open() will try direct invocation
-                return not rc
-            elif self.background:
-                if p.poll() is None:
-                    return True
-                else:
-                    return False
-            else:
-                return not p.wait()
-
-        import webbrowser
-        webbrowser.UnixBrowser._invoke = _invoke
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
new file mode 100644
index 00000000000..69f5d2a67ff
--- /dev/null
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -0,0 +1,120 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+# note, properties_animviz is a helper module only.
+
+if "bpy" in locals():
+    from imp import reload as _reload
+    for val in _modules_loaded.values():
+        _reload(val)
+_modules = (
+    "properties_animviz",
+    "properties_data_armature",
+    "properties_data_bone",
+    "properties_data_camera",
+    "properties_data_curve",
+    "properties_data_empty",
+    "properties_data_lamp",
+    "properties_data_lattice",
+    "properties_data_mesh",
+    "properties_data_metaball",
+    "properties_data_modifier",
+    "properties_game",
+    "properties_material",
+    "properties_object_constraint",
+    "properties_object",
+    "properties_particle",
+    "properties_physics_cloth",
+    "properties_physics_common",
+    "properties_physics_field",
+    "properties_physics_fluid",
+    "properties_physics_smoke",
+    "properties_physics_softbody",
+    "properties_render",
+    "properties_scene",
+    "properties_texture",
+    "properties_world",
+    "space_console",
+    "space_dopesheet",
+    "space_filebrowser",
+    "space_graph",
+    "space_image",
+    "space_info",
+    "space_logic",
+    "space_nla",
+    "space_node",
+    "space_outliner",
+    "space_sequencer",
+    "space_text",
+    "space_time",
+    "space_userpref_keymap",
+    "space_userpref",
+    "space_view3d",
+    "space_view3d_toolbar",
+)
+__import__(name=__name__, fromlist=_modules)
+_namespace = globals()
+_modules_loaded = {name: _namespace[name] for name in _modules}
+del _namespace
+
+
+import bpy
+
+
+def register():
+    bpy.utils.register_module(__name__)
+
+    # space_userprefs.py
+    from bpy.props import StringProperty, EnumProperty
+    WindowManager = bpy.types.WindowManager
+
+    WindowManager.addon_search = StringProperty(name="Search", description="Search within the selected filter")
+    WindowManager.addon_filter = EnumProperty(
+            items=[('All', "All", ""),
+                   ('Enabled', "Enabled", ""),
+                   ('Disabled', "Disabled", ""),
+                   ('3D View', "3D View", ""),
+                   ('Add Curve', "Add Curve", ""),
+                   ('Add Mesh', "Add Mesh", ""),
+                   ('Animation', "Animation", ""),
+                   ('Development', "Development", ""),
+                   ('Game Engine', "Game Engine", ""),
+                   ('Import-Export', "Import-Export", ""),
+                   ('Mesh', "Mesh", ""),
+                   ('Object', "Object", ""),
+                   ('Render', "Render", ""),
+                   ('Rigging', "Rigging", ""),
+                   ('System', "System", "")
+                   ],
+            name="Category",
+            description="Filter add-ons by category",
+            )
+
+    WindowManager.addon_support = EnumProperty(
+            items=[('OFFICIAL', "Official", ""),
+                   ('COMMUNITY', 'Community', ""),
+                  ],
+            name="Support",
+            description="Display support level", default={'OFFICIAL', 'COMMUNITY'}, options={'ENUM_FLAG'})
+    # done...
+
+
+def unregister():
+    bpy.utils.unregister_module(__name__)
diff --git a/release/scripts/ui/properties_animviz.py b/release/scripts/startup/bl_ui/properties_animviz.py
index 5f5684f5c89..ac25c643cab 100644
--- a/release/scripts/ui/properties_animviz.py
+++ b/release/scripts/startup/bl_ui/properties_animviz.py
@@ -22,6 +22,10 @@ import bpy
 
 # Generic Panels (Independent of DataType)
 
+# NOTE:
+# The specialised panel types are derived in their respective UI modules
+# dont register these classes since they are only helpers.
+
 
 class MotionPathButtonsPanel():
     bl_space_type = 'PROPERTIES'
@@ -90,17 +94,3 @@ class OnionSkinButtonsPanel():
         col = split.column()
         col.label(text="Display:")
         col.prop(arm, "show_only_ghost_selected", text="Selected Only")
-
-
-# NOTE:
-# The specialised panel types are derived in their respective UI modules
-# dont register these classes since they are only helpers.
-def register():
-    pass  # bpy.utils.register_module(__name__)
-
-
-def unregister():
-    pass  # bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py
index 55bc0cdb32f..7aa1dee2721 100644
--- a/release/scripts/ui/properties_data_armature.py
+++ b/release/scripts/startup/bl_ui/properties_data_armature.py
@@ -20,7 +20,6 @@
 import bpy
 from rna_prop_ui import PropertyPanel
 
-
 class ArmatureButtonsPanel():
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -260,8 +259,10 @@ class DATA_PT_iksolver_itasc(ArmatureButtonsPanel, bpy.types.Panel):
                 row.prop(itasc, "damping_max", text="Damp", slider=True)
                 row.prop(itasc, "damping_epsilon", text="Eps", slider=True)
 
-from properties_animviz import MotionPathButtonsPanel, OnionSkinButtonsPanel
-
+from bl_ui.properties_animviz import (
+    MotionPathButtonsPanel,
+    OnionSkinButtonsPanel,
+    )
 
 class DATA_PT_motion_paths(MotionPathButtonsPanel, bpy.types.Panel):
     #bl_label = "Bones Motion Paths"
@@ -307,14 +308,3 @@ class DATA_PT_custom_props_arm(ArmatureButtonsPanel, PropertyPanel, bpy.types.Pa
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "object.data"
     _property_type = bpy.types.Armature
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py
index a2c74b31c5e..271d40642a2 100644
--- a/release/scripts/ui/properties_data_bone.py
+++ b/release/scripts/startup/bl_ui/properties_data_bone.py
@@ -17,6 +17,7 @@
 # ##### END GPL LICENSE BLOCK #####
 
 # <pep8 compliant>
+
 import bpy
 from rna_prop_ui import PropertyPanel
 
@@ -367,14 +368,3 @@ class BONE_PT_custom_props(BoneButtonsPanel, PropertyPanel, bpy.types.Panel):
             return "active_pose_bone"
         else:
             return "active_bone"
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index 5096af42db3..6427e1c5180 100644
--- a/release/scripts/ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -134,14 +134,3 @@ class DATA_PT_custom_props_camera(CameraButtonsPanel, PropertyPanel, bpy.types.P
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "object.data"
     _property_type = bpy.types.Camera
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py
index 9acd40a3d12..8f117cd0335 100644
--- a/release/scripts/ui/properties_data_curve.py
+++ b/release/scripts/startup/bl_ui/properties_data_curve.py
@@ -390,14 +390,3 @@ class DATA_PT_custom_props_curve(CurveButtonsPanel, PropertyPanel, bpy.types.Pan
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "object.data"
     _property_type = bpy.types.Curve
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py
index 54e00b7099e..8b5c9f093a0 100644
--- a/release/scripts/ui/properties_data_empty.py
+++ b/release/scripts/startup/bl_ui/properties_data_empty.py
@@ -40,14 +40,3 @@ class DATA_PT_empty(DataButtonsPanel, bpy.types.Panel):
 
         layout.prop(ob, "empty_draw_type", text="Display")
         layout.prop(ob, "empty_draw_size", text="Size")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_data_lamp.py b/release/scripts/startup/bl_ui/properties_data_lamp.py
index 52268bfd834..00919d64ca5 100644
--- a/release/scripts/ui/properties_data_lamp.py
+++ b/release/scripts/startup/bl_ui/properties_data_lamp.py
@@ -384,14 +384,3 @@ class DATA_PT_custom_props_lamp(DataButtonsPanel, PropertyPanel, bpy.types.Panel
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "object.data"
     _property_type = bpy.types.Lamp
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_data_lattice.py b/release/scripts/startup/bl_ui/properties_data_lattice.py
index bb22e267b65..5f2fa4b4920 100644
--- a/release/scripts/ui/properties_data_lattice.py
+++ b/release/scripts/startup/bl_ui/properties_data_lattice.py
@@ -80,14 +80,3 @@ class DATA_PT_custom_props_lattice(DataButtonsPanel, PropertyPanel, bpy.types.Pa
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "object.data"
     _property_type = bpy.types.Lattice
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index fcf03cf0dcc..d6557fda8a2 100644
--- a/release/scripts/ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -349,14 +349,3 @@ class DATA_PT_custom_props_mesh(MeshButtonsPanel, PropertyPanel, bpy.types.Panel
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "object.data"
     _property_type = bpy.types.Mesh
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_data_metaball.py b/release/scripts/startup/bl_ui/properties_data_metaball.py
index 961d11d360c..952df9f5e36 100644
--- a/release/scripts/ui/properties_data_metaball.py
+++ b/release/scripts/startup/bl_ui/properties_data_metaball.py
@@ -116,14 +116,3 @@ class DATA_PT_custom_props_metaball(DataButtonsPanel, PropertyPanel, bpy.types.P
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "object.data"
     _property_type = bpy.types.MetaBall
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 8d5bc0f3519..848779c05b1 100644
--- a/release/scripts/ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -699,14 +699,3 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
         col = split.column()
         col.prop(md, "width", slider=True)
         col.prop(md, "narrowness", slider=True)
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index 4c6bb0e08ec..d04f486cf1e 100644
--- a/release/scripts/ui/properties_game.py
+++ b/release/scripts/startup/bl_ui/properties_game.py
@@ -496,14 +496,3 @@ class WORLD_PT_game_physics(WorldButtonsPanel, bpy.types.Panel):
             col = split.column()
             col.label(text="Logic Steps:")
             col.prop(gs, "logic_step_max", text="Max")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py
index 7fb333c4364..ff3153bbec9 100644
--- a/release/scripts/ui/properties_material.py
+++ b/release/scripts/startup/bl_ui/properties_material.py
@@ -967,14 +967,3 @@ class MATERIAL_PT_custom_props(MaterialButtonsPanel, PropertyPanel, bpy.types.Pa
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "material"
     _property_type = bpy.types.Material
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 4c1f4d28d5d..e906fc8d840 100644
--- a/release/scripts/ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -288,7 +288,11 @@ class OBJECT_PT_animation(ObjectButtonsPanel, bpy.types.Panel):
         col.prop(ob, "track_axis", text="Axis")
         col.prop(ob, "up_axis", text="Up Axis")
 
-from properties_animviz import MotionPathButtonsPanel, OnionSkinButtonsPanel
+
+from bl_ui.properties_animviz import (
+    MotionPathButtonsPanel,
+    OnionSkinButtonsPanel,
+    )
 
 
 class OBJECT_PT_motion_paths(MotionPathButtonsPanel, bpy.types.Panel):
@@ -331,14 +335,3 @@ class OBJECT_PT_custom_props(ObjectButtonsPanel, PropertyPanel, bpy.types.Panel)
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "object"
     _property_type = bpy.types.Object
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_object_constraint.py b/release/scripts/startup/bl_ui/properties_object_constraint.py
index b4822b675a9..d182264e3dc 100644
--- a/release/scripts/ui/properties_object_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_object_constraint.py
@@ -779,14 +779,3 @@ class BONE_PT_constraints(ConstraintButtonsPanel, bpy.types.Panel):
 
         for con in context.pose_bone.constraints:
             self.draw_constraint(context, con)
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index f67040d6a87..9c678bd96b2 100644
--- a/release/scripts/ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -20,10 +20,12 @@
 import bpy
 from rna_prop_ui import PropertyPanel
 
-from properties_physics_common import point_cache_ui
-from properties_physics_common import effector_weights_ui
-from properties_physics_common import basic_force_field_settings_ui
-from properties_physics_common import basic_force_field_falloff_ui
+from bl_ui.properties_physics_common import (
+    point_cache_ui,
+    effector_weights_ui,
+    basic_force_field_settings_ui,
+    basic_force_field_falloff_ui,
+    )
 
 
 def particle_panel_enabled(context, psys):
@@ -1209,14 +1211,3 @@ class PARTICLE_PT_custom_props(ParticleButtonsPanel, PropertyPanel, bpy.types.Pa
     COMPAT_ENGINES = {'BLENDER_RENDER'}
     _context_path = "particle_system.settings"
     _property_type = bpy.types.ParticleSettings
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py
index 0ac4429c71a..9bc3075a021 100644
--- a/release/scripts/ui/properties_physics_cloth.py
+++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py
@@ -20,8 +20,10 @@
 import bpy
 
 
-from properties_physics_common import point_cache_ui
-from properties_physics_common import effector_weights_ui
+from bl_ui.properties_physics_common import (
+    point_cache_ui,
+    effector_weights_ui,
+    )
 
 
 def cloth_panel_enabled(md):
@@ -214,14 +216,3 @@ class PHYSICS_PT_cloth_field_weights(PhysicButtonsPanel, bpy.types.Panel):
     def draw(self, context):
         cloth = context.cloth.settings
         effector_weights_ui(self, context, cloth.effector_weights)
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py
index e03c29cd549..fea012cc7c6 100644
--- a/release/scripts/ui/properties_physics_common.py
+++ b/release/scripts/startup/bl_ui/properties_physics_common.py
@@ -280,14 +280,3 @@ def basic_force_field_falloff_ui(self, context, field):
     sub = row.row()
     sub.active = field.use_max_distance
     sub.prop(field, "distance_max", text="Maximum")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py
index 7023f0c5058..fd5549c6e0a 100644
--- a/release/scripts/ui/properties_physics_field.py
+++ b/release/scripts/startup/bl_ui/properties_physics_field.py
@@ -20,8 +20,10 @@
 import bpy
 
 
-from properties_physics_common import basic_force_field_settings_ui
-from properties_physics_common import basic_force_field_falloff_ui
+from bl_ui.properties_physics_common import (
+    basic_force_field_settings_ui,
+    basic_force_field_falloff_ui,
+    )
 
 
 class PhysicButtonsPanel():
@@ -214,14 +216,3 @@ class PHYSICS_PT_collision(PhysicButtonsPanel, bpy.types.Panel):
 
             col.label(text="Force Fields:")
             col.prop(settings, "absorption", text="Absorption")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index 06b614d0b45..53eb67e1340 100644
--- a/release/scripts/ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -279,14 +279,3 @@ class PHYSICS_PT_domain_particles(PhysicButtonsPanel, bpy.types.Panel):
         col = layout.column(align=True)
         col.prop(fluid, "tracer_particles")
         col.prop(fluid, "generate_particles")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index 773382ba3d8..6cd1ceb5884 100644
--- a/release/scripts/ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -20,8 +20,10 @@
 import bpy
 
 
-from properties_physics_common import point_cache_ui
-from properties_physics_common import effector_weights_ui
+from bl_ui.properties_physics_common import (
+    point_cache_ui,
+    effector_weights_ui,
+    )
 
 
 class PhysicButtonsPanel():
@@ -199,14 +201,3 @@ class PHYSICS_PT_smoke_field_weights(PhysicButtonsPanel, bpy.types.Panel):
     def draw(self, context):
         domain = context.smoke.domain_settings
         effector_weights_ui(self, context, domain.effector_weights)
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py
index 7d3fa66ed02..2bd1a8599c1 100644
--- a/release/scripts/ui/properties_physics_softbody.py
+++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py
@@ -20,8 +20,10 @@
 import bpy
 
 
-from properties_physics_common import point_cache_ui
-from properties_physics_common import effector_weights_ui
+from bl_ui.properties_physics_common import (
+    point_cache_ui,
+    effector_weights_ui,
+    )
 
 
 def softbody_panel_enabled(md):
@@ -259,14 +261,3 @@ class PHYSICS_PT_softbody_field_weights(PhysicButtonsPanel, bpy.types.Panel):
         softbody = md.settings
 
         effector_weights_ui(self, context, softbody.effector_weights)
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index c5e56a61a8c..e4be38c560b 100644
--- a/release/scripts/ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -636,14 +636,3 @@ class RENDER_PT_bake(RenderButtonsPanel, bpy.types.Panel):
         sub.active = rd.use_bake_selected_to_active
         sub.prop(rd, "bake_distance")
         sub.prop(rd, "bake_bias")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index e28753f2df8..0f25523b586 100644
--- a/release/scripts/ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -301,14 +301,3 @@ class ANIM_OT_keying_set_export(bpy.types.Operator):
         wm = context.window_manager
         wm.fileselect_add(self)
         return {'RUNNING_MODAL'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index a67df41ab8b..7e289f1ecce 100644
--- a/release/scripts/ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -43,7 +43,7 @@ class TEXTURE_MT_envmap_specials(bpy.types.Menu):
         layout.operator("texture.envmap_clear", icon='FILE_REFRESH')
         layout.operator("texture.envmap_clear_all", icon='FILE_REFRESH')
 
-from properties_material import active_node_mat
+from bl_ui.properties_material import active_node_mat
 
 
 def context_tex_datablock(context):
@@ -1028,14 +1028,3 @@ class TEXTURE_PT_custom_props(TextureButtonsPanel, PropertyPanel, bpy.types.Pane
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "texture"
     _property_type = bpy.types.Texture
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/properties_world.py b/release/scripts/startup/bl_ui/properties_world.py
index fd11f299f34..1b2dd4e26aa 100644
--- a/release/scripts/ui/properties_world.py
+++ b/release/scripts/startup/bl_ui/properties_world.py
@@ -265,14 +265,3 @@ class WORLD_PT_custom_props(WorldButtonsPanel, PropertyPanel, bpy.types.Panel):
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "world"
     _property_type = bpy.types.World
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_console.py b/release/scripts/startup/bl_ui/space_console.py
index 7e75c05f603..591765c1543 100644
--- a/release/scripts/ui/space_console.py
+++ b/release/scripts/startup/bl_ui/space_console.py
@@ -158,14 +158,3 @@ class ConsoleLanguage(bpy.types.Operator):
             remove_duplicates=True)
 
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 57b5a1fb97f..1ba9a628c1a 100644
--- a/release/scripts/ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -360,14 +360,3 @@ class DOPESHEET_MT_gpencil_frame(bpy.types.Menu):
         #layout.separator()
         #layout.operator("action.copy")
         #layout.operator("action.paste")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py
index 0c551433184..3033ba10388 100644
--- a/release/scripts/ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@ -72,14 +72,3 @@ class FILEBROWSER_HT_header(bpy.types.Header):
                 row.prop(params, "use_filter_font", text="")
                 row.prop(params, "use_filter_sound", text="")
                 row.prop(params, "use_filter_text", text="")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
index f0c987c2b93..4e1b5aa9a6b 100644
--- a/release/scripts/ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@ -25,7 +25,7 @@ class GRAPH_HT_header(bpy.types.Header):
     bl_space_type = 'GRAPH_EDITOR'
 
     def draw(self, context):
-        from space_dopesheet import dopesheet_filter
+        from bl_ui.space_dopesheet import dopesheet_filter
 
         layout = self.layout
 
@@ -245,14 +245,3 @@ class GRAPH_MT_key_transform(bpy.types.Menu):
         layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND'
         layout.operator("transform.rotate", text="Rotate")
         layout.operator("transform.resize", text="Scale")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 46b164c6fdc..b2965d0c37a 100644
--- a/release/scripts/ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -751,14 +751,3 @@ class IMAGE_PT_paint_curve(BrushButtonsPanel, bpy.types.Panel):
         row.operator("brush.curve_preset", icon="SHARPCURVE", text="").shape = 'SHARP'
         row.operator("brush.curve_preset", icon="LINCURVE", text="").shape = 'LINE'
         row.operator("brush.curve_preset", icon="NOCURVE", text="").shape = 'MAX'
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index 2ec099dc051..be76cf7c4f8 100644
--- a/release/scripts/ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -202,6 +202,7 @@ class INFO_MT_mesh_add(bpy.types.Menu):
         layout.separator()
         layout.operator("mesh.primitive_grid_add", icon='MESH_GRID', text="Grid")
         layout.operator("mesh.primitive_monkey_add", icon='MESH_MONKEY', text="Monkey")
+        layout.operator("mesh.primitive_torus_add", text="Torus", icon='MESH_TORUS')
 
 
 class INFO_MT_curve_add(bpy.types.Menu):
@@ -398,14 +399,3 @@ class HELP_OT_operator_cheat_sheet(bpy.types.Operator):
         textblock.write('\n'.join(op_strings))
         self.report({'INFO'}, "See OperatorList.txt textblock")
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_logic.py b/release/scripts/startup/bl_ui/space_logic.py
index 3c55853e2e2..6eb33376fb7 100644
--- a/release/scripts/ui/space_logic.py
+++ b/release/scripts/startup/bl_ui/space_logic.py
@@ -85,14 +85,3 @@ class LOGIC_MT_view(bpy.types.Menu):
         layout.column()
 
         layout.operator("logic.properties", icon='MENU_PANEL')
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py
index 7388a839d6d..83d84647acb 100644
--- a/release/scripts/ui/space_nla.py
+++ b/release/scripts/startup/bl_ui/space_nla.py
@@ -189,14 +189,3 @@ class NLA_MT_edit_transform(bpy.types.Menu):
         layout.operator("transform.translate", text="Grab/Move")
         layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND'
         layout.operator("transform.resize", text="Scale")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index 1076b13c28e..7374b2ca260 100644
--- a/release/scripts/ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -191,14 +191,3 @@ class NODE_PT_properties(bpy.types.Panel):
         col.prop(snode, "backdrop_x", text="X")
         col.prop(snode, "backdrop_y", text="Y")
         col.operator("node.backimage_move", text="Move")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 4108e7358b4..aca213c77fe 100644
--- a/release/scripts/ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -115,14 +115,3 @@ class OUTLINER_MT_edit_datablocks(bpy.types.Menu):
 
         col.operator("outliner.drivers_add_selected")
         col.operator("outliner.drivers_delete_selected")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 872b64e0e6d..77ac18e8600 100644
--- a/release/scripts/ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -799,14 +799,3 @@ class SEQUENCER_PT_view(SequencerButtonsPanel_Output, bpy.types.Panel):
         if st.display_mode == 'WAVEFORM':
             col.prop(st, "show_separate_color")
         col.prop(st, "proxy_render_size")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py
index d1ccdf2acbb..d21d6952023 100644
--- a/release/scripts/ui/space_text.py
+++ b/release/scripts/startup/bl_ui/space_text.py
@@ -297,14 +297,3 @@ class TEXT_MT_toolbox(bpy.types.Menu):
         layout.separator()
 
         layout.operator("text.run_script")
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py
index ba10c370389..f3c2bed5a1d 100644
--- a/release/scripts/ui/space_time.py
+++ b/release/scripts/startup/bl_ui/space_time.py
@@ -196,14 +196,3 @@ class TIME_MT_autokey(bpy.types.Menu):
 
         layout.prop_enum(tools, "auto_keying_mode", 'ADD_REPLACE_KEYS')
         layout.prop_enum(tools, "auto_keying_mode", 'REPLACE_KEYS')
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 89f703d8981..c79caf78b4b 100644
--- a/release/scripts/ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -737,7 +737,7 @@ class USERPREF_PT_file(bpy.types.Panel):
         sub.active = paths.use_auto_save_temporary_files
         sub.prop(paths, "auto_save_time", text="Timer (mins)")
 
-from space_userpref_keymap import InputKeyMapPanel
+from bl_ui.space_userpref_keymap import InputKeyMapPanel
 
 
 class USERPREF_PT_input(InputKeyMapPanel):
@@ -1170,45 +1170,3 @@ class WM_OT_addon_expand(bpy.types.Operator):
         info = addon_utils.module_bl_info(mod)
         info["show_expanded"] = not info["show_expanded"]
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-    WindowManager = bpy.types.WindowManager
-
-    WindowManager.addon_search = StringProperty(name="Search", description="Search within the selected filter")
-    WindowManager.addon_filter = EnumProperty(
-            items=[('All', "All", ""),
-                   ('Enabled', "Enabled", ""),
-                   ('Disabled', "Disabled", ""),
-                   ('3D View', "3D View", ""),
-                   ('Add Curve', "Add Curve", ""),
-                   ('Add Mesh', "Add Mesh", ""),
-                   ('Animation', "Animation", ""),
-                   ('Development', "Development", ""),
-                   ('Game Engine', "Game Engine", ""),
-                   ('Import-Export', "Import-Export", ""),
-                   ('Mesh', "Mesh", ""),
-                   ('Object', "Object", ""),
-                   ('Render', "Render", ""),
-                   ('Rigging', "Rigging", ""),
-                   ('System', "System", "")
-                   ],
-            name="Category",
-            description="Filter add-ons by category",
-            )
-
-    WindowManager.addon_support = EnumProperty(
-            items=[('OFFICIAL', "Official", ""),
-                   ('COMMUNITY', 'Community', ""),
-                  ],
-            name="Support",
-            description="Display support level", default={'OFFICIAL', 'COMMUNITY'}, options={'ENUM_FLAG'})
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_userpref_keymap.py b/release/scripts/startup/bl_ui/space_userpref_keymap.py
index 60bd89db60a..4b3ff36abe9 100644
--- a/release/scripts/ui/space_userpref_keymap.py
+++ b/release/scripts/startup/bl_ui/space_userpref_keymap.py
@@ -779,14 +779,3 @@ class WM_OT_keyconfig_remove(bpy.types.Operator):
         keyconfig = wm.keyconfigs.active
         wm.keyconfigs.remove(keyconfig)
         return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 751d54dd289..31704173258 100644
--- a/release/scripts/ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -177,6 +177,10 @@ class VIEW3D_MT_transform(bpy.types.Menu):
         layout.operator("object.origin_set", text="Origin to Geometry").type = 'ORIGIN_GEOMETRY'
         layout.operator("object.origin_set", text="Origin to 3D Cursor").type = 'ORIGIN_CURSOR'
 
+        if context.mode == 'OBJECT':
+            layout.operator("object.align")
+            layout.operator("object.randomize_transform")
+
 
 class VIEW3D_MT_mirror(bpy.types.Menu):
     bl_label = "Mirror"
@@ -250,6 +254,14 @@ class VIEW3D_MT_uv_map(bpy.types.Menu):
 
         layout.operator("uv.reset")
 
+        layout.separator()
+
+        # python scripts
+        layout.operator_context = 'INVOKE_REGION_WIN'
+        layout.operator("uv.smart_project")
+        layout.operator("uv.lightmap_pack")
+        layout.operator("uv.follow_active_quads")
+
 # ********** View menus **********
 
 
@@ -2301,14 +2313,3 @@ class VIEW3D_PT_context_properties(bpy.types.Panel):
         if member:
             # Draw with no edit button
             rna_prop_ui.draw(self.layout, context, member, object, False)
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 47660810ea9..795e73675eb 100644
--- a/release/scripts/ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1310,14 +1310,3 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, bpy.types.Panel):
             sub = col.row()
             sub.active = pe.use_fade_time
             sub.prop(pe, "fade_frames", slider=True)
-
-
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
-    register()
diff --git a/release/scripts/keyingsets/keyingsets_builtins.py b/release/scripts/startup/keyingsets_builtins.py
index 6b0b282fd47..6b0b282fd47 100644
--- a/release/scripts/keyingsets/keyingsets_builtins.py
+++ b/release/scripts/startup/keyingsets_builtins.py