diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt
index a92a963..9f29c8c 100644
--- a/src/nvtt/CMakeLists.txt
+++ b/src/nvtt/CMakeLists.txt
@@ -85,21 +85,22 @@ TARGET_LINK_LIBRARIES(stress nvcore nvmath nvimage nvtt)
 ADD_EXECUTABLE(nvzoom tools/resize.cpp tools/cmdline.h)
 TARGET_LINK_LIBRARIES(nvzoom nvcore nvmath nvimage)
 
-#include_directories("/usr/include/ffmpeg/")
-#ADD_EXECUTABLE(nvmpegenc tools/mpegenc.cpp tools/cmdline.h)
-#TARGET_LINK_LIBRARIES(nvmpegenc nvcore nvmath nvimage avcodec z)
-
 INSTALL(TARGETS nvcompress nvdecompress nvddsinfo nvimgdiff nvassemble nvzoom DESTINATION bin)
 
+include_directories("/usr/include/ffmpeg/")
+ADD_EXECUTABLE(nvmpegenc tools/mpegenc.cpp tools/cmdline.h)
+TARGET_LINK_LIBRARIES(nvmpegenc nvcore nvmath nvimage avcodec z)
+INSTALL(TARGETS nvmpegenc DESTINATION bin)
+
 # UI tools
 IF(QT4_FOUND) # AND NOT MSVC)
 	SET(QT_USE_QTOPENGL TRUE)
 	INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 	
 	SET(SRCS
-		tools/main.cpp
-		tools/configdialog.h
-		tools/configdialog.cpp)
+		tools/ui/main.cpp
+		tools/ui/configdialog.h
+		tools/ui/configdialog.cpp)
 
 	SET(LIBS
 		nvtt
@@ -107,9 +108,9 @@ IF(QT4_FOUND) # AND NOT MSVC)
 		${QT_QTGUI_LIBRARY}
 		${QT_QTOPENGL_LIBRARY})
 
-	QT4_WRAP_UI(UICS tools/configdialog.ui)
-	QT4_WRAP_CPP(MOCS tools/configdialog.h)
-	#QT4_ADD_RESOURCES(RCCS tools/configdialog.rc)
+	QT4_WRAP_UI(UICS tools/ui/configdialog.ui)
+	QT4_WRAP_CPP(MOCS tools/ui/configdialog.h)
+	#QT4_ADD_RESOURCES(RCCS tools/ui/configdialog.rc)
 
 	ADD_EXECUTABLE(nvcompressui MACOSX_BUNDLE ${SRCS} ${UICS} ${MOCS})
 	TARGET_LINK_LIBRARIES(nvcompressui ${LIBS})
diff --git a/src/nvtt/tools/configdialog.cpp b/src/nvtt/tools/ui/configdialog.cpp
similarity index 100%
rename from src/nvtt/tools/configdialog.cpp
rename to src/nvtt/tools/ui/configdialog.cpp
diff --git a/src/nvtt/tools/configdialog.h b/src/nvtt/tools/ui/configdialog.h
similarity index 100%
rename from src/nvtt/tools/configdialog.h
rename to src/nvtt/tools/ui/configdialog.h
diff --git a/src/nvtt/tools/configdialog.ui b/src/nvtt/tools/ui/configdialog.ui
similarity index 100%
rename from src/nvtt/tools/configdialog.ui
rename to src/nvtt/tools/ui/configdialog.ui
diff --git a/src/nvtt/tools/main.cpp b/src/nvtt/tools/ui/main.cpp
similarity index 100%
rename from src/nvtt/tools/main.cpp
rename to src/nvtt/tools/ui/main.cpp