Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 20117)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 20118)
@@ -173,7 +173,7 @@
 # This file also should go to Python site-wide modules directory
 # so for users it look 'just being here'
-VBox-python-glue_SOURCES = glue/vboxapi.py=>glue/python/vboxapi.py
-
-VBOX_PYTHON_CONSTANTS = $(VBOX_PATH_SDK)/bindings/glue/python/VirtualBox_constants.py
+VBox-python-glue_SOURCES = glue/vboxapi.py=>glue/python/vboxapi/__init__.py
+
+VBOX_PYTHON_CONSTANTS = $(VBOX_PATH_SDK)/bindings/glue/python/vboxapi/VirtualBox_constants.py
 OTHERS += $(VBOX_PYTHON_CONSTANTS)
 
Index: /trunk/src/VBox/Main/glue/vboxapi.py
===================================================================
--- /trunk/src/VBox/Main/glue/vboxapi.py	(revision 20117)
+++ /trunk/src/VBox/Main/glue/vboxapi.py	(revision 20118)
@@ -21,6 +21,6 @@
 
 if VboxBinDir is None:
-    # @todo: To be set by installer
-    VboxBinDir = "/home/nike/work/ws/out/linux.amd64/debug/bin/"
+    # Will be set by the installer
+    VboxBinDir = "%VBOX_INSTALL_PATH%"
 
 if VboxSdkDir is None:
@@ -28,7 +28,7 @@
 
 os.environ["VBOX_PROGRAM_PATH"] = VboxBinDir
-os.environ["VBOX_SDK_PATH"] = VboxSdkDir
+#os.environ["VBOX_SDK_PATH"] = VboxSdkDir
 sys.path.append(VboxBinDir)
-sys.path.append(VboxSdkDir+"/bindings/glue/python")
+#sys.path.append(VboxSdkDir+"/bindings/glue/python")
 
 from VirtualBox_constants import VirtualBoxReflectionInfo