diff --git a/Makefile.am b/Makefile.am
index 289f1620be..0e57eb3b53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,10 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
 SUBDIRS = 		\
-	src           	\
+	gst \
 	m4   		\
-	common
+	common \
+	examples
 
 DIST_SUBDIRS = $(SUBDIRS)
 
diff --git a/autogen.sh b/autogen.sh
index 0a8c579abe..737032a07c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
 
 DIE=0
 package=gst-rtsp
-srcfile=src/rtsp-server.c
+srcfile=gst/rtsp-server/rtsp-server.c
 
 # a quick cvs co to ease the transition
 if test ! -d common;
diff --git a/configure.ac b/configure.ac
index 63a2231d41..8d281d37b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl check if this is a release version
 AS_NANO(GST_CVS="no", GST_CVS="yes")
 
 dnl can autoconf find the source ?
-AC_CONFIG_SRCDIR([src/rtsp-server.c])
+AC_CONFIG_SRCDIR([gst/rtsp-server/rtsp-server.c])
 
 dnl define the output header for config
 AM_CONFIG_HEADER([config.h])
@@ -215,7 +215,9 @@ gst-rtsp.spec
 common/Makefile
 common/m4/Makefile
 m4/Makefile
-src/Makefile
+gst/Makefile
+gst/rtsp-server/Makefile
+examples/Makefile
 ])
 AC_OUTPUT
 
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000000..f5b20c4555
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,11 @@
+
+noinst_PROGRAMS = gst-rtsp-server
+
+gst_rtsp_server_SOURCES = \
+	main.c 
+
+gst_rtsp_server_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+gst_rtsp_server_LDFLAGS = \
+	$(GST_LIBS) \
+	$(top_builddir)/gst/rtsp-server/libgstrtspserver.la
+
diff --git a/src/main.c b/examples/main.c
similarity index 96%
rename from src/main.c
rename to examples/main.c
index 70b1fdc9d2..41a1cb91ad 100644
--- a/src/main.c
+++ b/examples/main.c
@@ -19,7 +19,7 @@
 
 #include <gst/gst.h>
 
-#include "rtsp-server.h"
+#include <gst/rtsp-server/rtsp-server.h>
 
 int
 main (int argc, char *argv[])
diff --git a/gst/Makefile.am b/gst/Makefile.am
new file mode 100644
index 0000000000..e37bbc66e9
--- /dev/null
+++ b/gst/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = rtsp-server
diff --git a/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am
new file mode 100644
index 0000000000..752b55b564
--- /dev/null
+++ b/gst/rtsp-server/Makefile.am
@@ -0,0 +1,28 @@
+public_headers = \
+		rtsp-server.h \
+		rtsp-client.h \
+		rtsp-media.h
+		
+c_sources = \
+	rtsp-server.c \
+	rtsp-client.c \
+	rtsp-media.c \
+	rtsp-session-pool.c \
+	rtsp-session.c
+
+lib_LTLIBRARIES = \
+	libgstrtspserver.la
+
+libgstrtspserver_la_SOURCES = \
+    $(c_sources)
+    
+libgstrtspserver_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstrtspserver_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstrtspserver_la_LIBADD = \
+	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
+    -lgstrtp-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ \
+            -lgstsdp-@GST_MAJORMINOR@ $(GST_LIBS) $(LIBM)
+libgstrtspserver_la_LIBTOOLFLAGS = --tag=disable-static
+
+libgstrtspserver_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/rtsp-server
+libgstrtspserver_include_HEADERS = $(public_headers)
diff --git a/src/rtsp-client.c b/gst/rtsp-server/rtsp-client.c
similarity index 100%
rename from src/rtsp-client.c
rename to gst/rtsp-server/rtsp-client.c
diff --git a/src/rtsp-client.h b/gst/rtsp-server/rtsp-client.h
similarity index 100%
rename from src/rtsp-client.h
rename to gst/rtsp-server/rtsp-client.h
diff --git a/src/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
similarity index 100%
rename from src/rtsp-media.c
rename to gst/rtsp-server/rtsp-media.c
diff --git a/src/rtsp-media.h b/gst/rtsp-server/rtsp-media.h
similarity index 100%
rename from src/rtsp-media.h
rename to gst/rtsp-server/rtsp-media.h
diff --git a/src/rtsp-server.c b/gst/rtsp-server/rtsp-server.c
similarity index 100%
rename from src/rtsp-server.c
rename to gst/rtsp-server/rtsp-server.c
diff --git a/src/rtsp-server.h b/gst/rtsp-server/rtsp-server.h
similarity index 100%
rename from src/rtsp-server.h
rename to gst/rtsp-server/rtsp-server.h
diff --git a/src/rtsp-session-pool.c b/gst/rtsp-server/rtsp-session-pool.c
similarity index 100%
rename from src/rtsp-session-pool.c
rename to gst/rtsp-server/rtsp-session-pool.c
diff --git a/src/rtsp-session-pool.h b/gst/rtsp-server/rtsp-session-pool.h
similarity index 100%
rename from src/rtsp-session-pool.h
rename to gst/rtsp-server/rtsp-session-pool.h
diff --git a/src/rtsp-session.c b/gst/rtsp-server/rtsp-session.c
similarity index 100%
rename from src/rtsp-session.c
rename to gst/rtsp-server/rtsp-session.c
diff --git a/src/rtsp-session.h b/gst/rtsp-server/rtsp-session.h
similarity index 100%
rename from src/rtsp-session.h
rename to gst/rtsp-server/rtsp-session.h
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 82674faf5f..0000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-bin_PROGRAMS = gst-rtsp-server
-
-gst_rtsp_server_SOURCES = 	main.c \
-			rtsp-server.c \
-			rtsp-client.c \
-			rtsp-media.c \
-			rtsp-session-pool.c \
-			rtsp-session.c
-
-gst_rtsp_server_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-gst_rtsp_server_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
-		    -lgstrtp-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ \
-                    -lgstsdp-@GST_MAJORMINOR@ $(GST_LIBS) $(LIBM)
-gst_rtsp_server_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = rtsp-server.h \
-		rtsp-client.h \
-		rtsp-session.h \
-		rtsp-session-pool.h \
-		rtsp-media.h