diff --git a/gst/CMakeLists.txt b/gst/CMakeLists.txt
index 32fd772..b445b95 100644
--- a/gst/CMakeLists.txt
+++ b/gst/CMakeLists.txt
@@ -1,24 +1 @@
-add_definitions (-DHAVE_CONFIG_H)
-
-set (SOURCES
-	main.c
-    gstvideolevels.c)
-    
-set (HEADERS
-    gstvideolevels.h)
-    
-include_directories(AFTER
-  . )
-
-add_library ( libgstvision MODULE
-  ${SOURCES}
-  ${HEADERS})
-  
-target_link_libraries ( libgstvision
-  general ${GLIB2_LIBRARIES}
-  general ${GSTREAMER_LIBRARIES}
-  general ${GSTREAMER_BASE_LIBRARY}
-  general ${GSTREAMER_VIDEO_LIBRARY})
-  
-install (TARGETS libgstnvl
-    LIBRARY DESTINATION lib/gstreamer-0.10)
+add_subdirectory (videoadjust)
diff --git a/gst/videoadjust/CMakeLists.txt b/gst/videoadjust/CMakeLists.txt
new file mode 100644
index 0000000..4790886
--- /dev/null
+++ b/gst/videoadjust/CMakeLists.txt
@@ -0,0 +1,24 @@
+add_definitions (-DHAVE_CONFIG_H)
+
+set (SOURCES
+	gstvideoadjust.c
+    gstvideolevels.c)
+    
+set (HEADERS
+    gstvideolevels.h)
+    
+include_directories(AFTER
+  . )
+
+add_library (libgstvideoadjust MODULE
+  ${SOURCES}
+  ${HEADERS})
+  
+target_link_libraries (libgstvideoadjust
+  general ${GLIB2_LIBRARIES}
+  general ${GSTREAMER_LIBRARIES}
+  general ${GSTREAMER_BASE_LIBRARY}
+  general ${GSTREAMER_VIDEO_LIBRARY})
+  
+install (TARGETS libgstvideoadjust
+    LIBRARY DESTINATION lib/gstreamer-0.10)
\ No newline at end of file
diff --git a/gst/main.c b/gst/videoadjust/gstvideoadjust.c
similarity index 51%
rename from gst/main.c
rename to gst/videoadjust/gstvideoadjust.c
index 3d88066..378eb14 100644
--- a/gst/main.c
+++ b/gst/videoadjust/gstvideoadjust.c
@@ -4,21 +4,22 @@
 
 #include "gstvideolevels.h"
 
-#define GST_CAT_DEFAULT gst_nvl_gstnvl_debug
+#define GST_CAT_DEFAULT gst_nvl_gstvideoadjust_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
+
 /* Register filters that make up the gstgl plugin */
 static gboolean
-plugin_init ( GstPlugin * plugin )
+plugin_init (GstPlugin * plugin)
 {
-    GST_DEBUG_CATEGORY_INIT ( gst_nvl_gstnvl_debug, "nvl", 0, "nvl" );
+    GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "videoadjust", 0, "videoadjust");
 
-    GST_CAT_INFO ( gst_nvl_gstnvl_debug, "plugin_init" );
+    GST_DEBUG ("plugin_init");
 
+    GST_CAT_INFO (GST_CAT_DEFAULT, "registering videolevels element");
 
-    GST_CAT_INFO ( gst_nvl_gstnvl_debug, "registering videolevels element" );
-    if ( !gst_element_register ( plugin, "videolevels", GST_RANK_NONE,
-        GST_TYPE_VIDEOLEVELS ) ) {
+    if ( !gst_element_register (plugin, "videolevels", GST_RANK_NONE,
+        GST_TYPE_VIDEOLEVELS)) {
         return FALSE;
     }
    
@@ -27,8 +28,8 @@ plugin_init ( GstPlugin * plugin )
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
                    GST_VERSION_MINOR,
-                   "nvl",
-                   "Plugins of interest to NVL",
+                   "videoadjust",
+                   "Filters that apply transform from 16-bit to 8-bit video",
                    plugin_init,
                    VERSION,
                    GST_LICENSE,
diff --git a/gst/gstvideolevels.c b/gst/videoadjust/gstvideolevels.c
similarity index 100%
rename from gst/gstvideolevels.c
rename to gst/videoadjust/gstvideolevels.c
diff --git a/gst/gstvideolevels.h b/gst/videoadjust/gstvideolevels.h
similarity index 100%
rename from gst/gstvideolevels.h
rename to gst/videoadjust/gstvideolevels.h
diff --git a/sys/gstniimaq.c b/sys/gstniimaq.c
index 0048a4d..43ca109 100644
--- a/sys/gstniimaq.c
+++ b/sys/gstniimaq.c
@@ -666,7 +666,6 @@ gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
   gpointer data;
   GstFlowReturn res = GST_FLOW_OK;
   guint i;
-  GstClock *clock;
   GstNiImaqSrcFrameTime * frametime;
   GstClockTime timestamp = GST_CLOCK_TIME_NONE;
   GstClockTime timestamp2 = GST_CLOCK_TIME_NONE;
@@ -1163,5 +1162,5 @@ plugin_init (GstPlugin * plugin)
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "niimaq",
-    "NI-IMAQ Video Source", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME,
+    "NI-IMAQ source element", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME,
     GST_PACKAGE_ORIGIN)
\ No newline at end of file