diff --git a/ChangeLog b/ChangeLog
index 934d7bd780..018cebc373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-04  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* Makefile.am:
+	* autogen.sh:
+	* configure.ac:
+	* gst/__init__.py:
+	* gst/gstmodule.c: (init_gst):
+          move gstreamer/ to gst/ by cvs surgery so we can work uninstalled
+          more changes to be able to run uninstalled
+
 2004-02-27  Johan Dahlin  <johan@gnome.org>
 
 	* gstreamer/: All over the place, more rename work (gstreamer -> gst)
diff --git a/Makefile.am b/Makefile.am
index 02d72ec645..05d8fec899 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ endif
 INTERFACESDIR = gstinterfaces
 PLAYDIR = gstplay
 
-UNCONDDIRS = gstreamer pkgconfig examples testsuite
+UNCONDDIRS = gst pkgconfig examples testsuite
 SUBDIRS = \
 	$(UNCONDDIRS) \
 	$(INTERFACESDIR) \
diff --git a/autogen.sh b/autogen.sh
index f0985f5356..475c312bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
 
 DIE=0
 package=gst-python
-srcfile=gstreamer/gstmodule.c
+srcfile=gst/gstmodule.c
                                                                                 
 # a quick cvs co if necessary to alleviate the pain - may remove this
 # when developers get a clue ;)
diff --git a/configure.ac b/configure.ac
index 60832fcfe0..36f88db034 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_CANONICAL_TARGET
 AS_VERSION(gst-python, GST_PYTHON_VERSION, 0, 1, 0, 1)
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 
-AC_CONFIG_SRCDIR([gstreamer/gstmodule.c])
+AC_CONFIG_SRCDIR([gst/gstmodule.c])
 AM_CONFIG_HEADER(config.h)
 
 dnl Add parameters for aclocal
@@ -45,9 +45,9 @@ GST_MAJORMINOR=0.7
 PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ,
                   HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no)
 
-dnl Give error and exit if we don't have gstreamer
+dnl Give error and exit if we don't have GStreamer
 if test "x$HAVE_GSTREAMER" = "xno"; then
-  AC_MSG_ERROR(you need gstreamer development packages installed !)
+  AC_MSG_ERROR(you need GStreamer development packages installed !)
 fi
 AC_SUBST(GST_MAJORMINOR)
 
@@ -144,7 +144,7 @@ changequote([,])dnl
 
 AC_OUTPUT([
   Makefile
-  gstreamer/Makefile
+  gst/Makefile
   gstinterfaces/Makefile
   gstplay/Makefile
   pkgconfig/Makefile
diff --git a/examples/gst/lat.py b/examples/gst/lat.py
index 5dc6288e45..6e57306920 100755
--- a/examples/gst/lat.py
+++ b/examples/gst/lat.py
@@ -144,7 +144,6 @@ tests = {
 
 def main():
    "A GStreamer latency tester"
-   #gst_debug_set_categories(-1)
    global iterations, print_del
 
    if len(sys.argv) < 3:
diff --git a/examples/gst/vorbisplay.py b/examples/gst/vorbisplay.py
index 4b5960a1f6..acb9dd0e30 100755
--- a/examples/gst/vorbisplay.py
+++ b/examples/gst/vorbisplay.py
@@ -99,7 +99,6 @@ def decoder_notified(sender, pspec):
                                      
 def main():
     "Basic example to play an Ogg Vorbis stream through OSS"
-    #gst_debug_set_categories(-1)
 
     if len(sys.argv) != 2:
         print 'usage: %s <Ogg Vorbis file>' % (sys.argv[0])
diff --git a/examples/gstreamer/lat.py b/examples/gstreamer/lat.py
index 5dc6288e45..6e57306920 100755
--- a/examples/gstreamer/lat.py
+++ b/examples/gstreamer/lat.py
@@ -144,7 +144,6 @@ tests = {
 
 def main():
    "A GStreamer latency tester"
-   #gst_debug_set_categories(-1)
    global iterations, print_del
 
    if len(sys.argv) < 3:
diff --git a/examples/gstreamer/vorbisplay.py b/examples/gstreamer/vorbisplay.py
index 4b5960a1f6..acb9dd0e30 100755
--- a/examples/gstreamer/vorbisplay.py
+++ b/examples/gstreamer/vorbisplay.py
@@ -99,7 +99,6 @@ def decoder_notified(sender, pspec):
                                      
 def main():
     "Basic example to play an Ogg Vorbis stream through OSS"
-    #gst_debug_set_categories(-1)
 
     if len(sys.argv) != 2:
         print 'usage: %s <Ogg Vorbis file>' % (sys.argv[0])
diff --git a/gst/__init__.py b/gst/__init__.py
index 5ad3871b91..ac7907ffa9 100644
--- a/gst/__init__.py
+++ b/gst/__init__.py
@@ -36,7 +36,6 @@ sys.setdlopenflags(dl.RTLD_LAZY | dl.RTLD_GLOBAL)
 del devloc, sys, os
 
 from _gst import *
-del _gst
 
 def threads_init():
     import gtk
diff --git a/gst/gstmodule.c b/gst/gstmodule.c
index 30508fa545..217447706c 100644
--- a/gst/gstmodule.c
+++ b/gst/gstmodule.c
@@ -70,7 +70,7 @@ init_gst (void)
             g_free (argv);
         }
 
-	m = Py_InitModule ("gst._gst", pygst_functions);
+	m = Py_InitModule ("_gst", pygst_functions);
 	d = PyModule_GetDict (m);
 
 	pygst_register_classes (d);