diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a92a9e3ec..5bf263227 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,12 +1,11 @@
 project (PROJECTM_ROOT)
 
-OPTION(INCLUDE-QPROJECTM "Build the projectM qt4 user interface extension library (recommended)" ON)
-OPTION(INCLUDE-QPROJECTM-PULSEAUDIO "Build the projectM Qt4 / pulse audio client (recommended for fedora users)" ON)
+OPTION(INCLUDE-PROJECTM-QT "Build the projectM Qt4 user interface extension library (recommended)" ON)
+OPTION(INCLUDE-PROJECTM-PULSEAUDIO "Build the projectM pulse audio client (recommended for fedora users)" ON)
 OPTION(INCLUDE-PROJECTM-LIBVISUAL "Build the projectM libvisual client" ON)
-OPTION(INCLUDE-QPROJECTM-JACK "Build the projectM Qt4 / JACK client" OFF)
-OPTION(INCLUDE-PROJECTM-JACK "Build the projectM SDL / JACK client" OFF)
+OPTION(INCLUDE-PROJECTM-JACK "Build the projectM JACK client" OFF)
 OPTION(INCLUDE-PROJECTM-TEST "Build the projectM test suite" ON)
-OPTION(INCLUDE-PROJECTM-XMMS "Build the projectM xmms module (deprecated)" OFF)
+OPTION(INCLUDE-PROJECTM-XMMS "Build the projectM xmms module (deprecated, use audacious instead)" OFF)
 
 add_subdirectory (projectM-engine)
 
@@ -14,21 +13,17 @@ if(INCLUDE-PROJECTM-TEST)
 	add_subdirectory (projectM-test)
 endif(INCLUDE-PROJECTM-TEST)
 
-if (INCLUDE-QPROJECTM)
-	add_subdirectory (qprojectM)
-endif(INCLUDE-QPROJECTM)
-
-if (INCLUDE-QPROJECTM-JACK)
-	add_subdirectory (qprojectM-jack)
-endif (INCLUDE-QPROJECTM-JACK)
+if (INCLUDE-PROJECTM-QT)
+	add_subdirectory (projectM-qt)
+endif(INCLUDE-PROJECTM-QT)
 
 if (INCLUDE-PROJECTM-JACK)
 	add_subdirectory (projectM-jack)
 endif (INCLUDE-PROJECTM-JACK)
 
-if (INCLUDE-QPROJECTM-PULSEAUDIO)
-	add_subdirectory (qprojectM-pulseaudio)
-endif (INCLUDE-QPROJECTM-PULSEAUDIO)
+if (INCLUDE-PROJECTM-PULSEAUDIO)
+	add_subdirectory (projectM-pulseaudio)
+endif (INCLUDE-PROJECTM-PULSEAUDIO)
 
 if (INCLUDE-PROJECTM-XMMS)
 	add_subdirectory (projectM-xmms)
diff --git a/src/projectM-jack/CMakeLists.txt b/src/projectM-jack/CMakeLists.txt
index 6a2506ec3..ea7ec10d9 100644
--- a/src/projectM-jack/CMakeLists.txt
+++ b/src/projectM-jack/CMakeLists.txt
@@ -1,5 +1,83 @@
 PROJECT(projectM-jack)
 
+if (USE_PROJECTM_QT)
+
+set(QT_USE_OPENGL TRUE)
+
+include(${QT_USE_FILE} FindPkgConfig.cmake)
+
+if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
+	pkg_search_module(LIBPROJECTM REQUIRED libprojectM)
+	pkg_search_module(LIBPROJECTM-QT REQUIRED libprojectM-qt)
+else(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
+	set(LIBPROJECTM_FOUND true)
+	set(LIBPROJECTM-QT_FOUND true)
+endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
+
+FIND_PACKAGE(OpenGL)
+FIND_PACKAGE(Qt4 REQUIRED)
+
+pkg_search_module(JACK REQUIRED jack)
+
+if (LIBPROJECTM_FOUND)
+MESSAGE (STATUS "projectM detected.")
+else(LIBPROJECTM_FOUND)
+MESSAGE (FATAL_ERROR "projectM NOT detected. Please install the projectM module or build from the top level projectM source directory.")
+endif(LIBPROJECTM_FOUND)
+
+if (LIBPROJECTM-QT_FOUND)
+MESSAGE (STATUS "projectM-qt detected.")
+else(LIBPROJECTM-QT_FOUND)
+MESSAGE (FATAL_ERROR "qprojectM NOT detected. Please install the qprojectM module or build from the top level projectM source directory.")
+endif(LIBPROJECTM-QT_FOUND)
+
+if (JACK_FOUND)
+MESSAGE(STATUS "Jack detected")
+else (JACK_FOUND)
+MESSAGE(FATAL_ERROR "JACK is NOT found. Please install jack from http://www.jackaudio.org.")
+endif(JACK_FOUND)
+
+# the variable "qprojectM_SRCS" contains all .cpp files of this project
+set(projectM_jack_SRCS
+  qprojectM-jack.cpp ConfigFile.h ConfigFile.cpp
+)
+
+set(projectM_jack_MOC_HDRS
+
+)
+
+
+# After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx.
+qt4_wrap_cpp(projectM_jack_MOC_SRCS ${projectM_MOC_HDRS})
+
+
+ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"')
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+
+
+if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+   set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt)
+   set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt)
+elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
+   set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM-qt ${LIBPROJECTM-QT_INCLUDEDIR}/libprojectM)
+   set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBPROJECTM-QT_LDFLAGS})
+# qprojectM places itself in same location as (lib)projectM 
+# whether it should is a whole other issue
+endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+
+
+INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR}  ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
+
+LINK_DIRECTORIES(${PROJECTM_LINK} ${JACK_LDFLAGS})
+
+ADD_EXECUTABLE(projectM-jack ${qprojectM_jack_SRCS} ${qprojectM_jack_MOC_SRCS})
+
+TARGET_LINK_LIBRARIES(projectM-jack qprojectM projectM jack ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTCORE_LIBRARIES} ${QT_LIBRARIES})
+
+INSTALL(TARGETS projectM-jack DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+
+else(USE_PROJECTM_QT)
 ADD_EXECUTABLE(projectM-jack projectM-jack.cpp sdltoprojectM.h video_init.cpp ConfigFile.h ConfigFile.cpp)
 
 INCLUDE(FindPkgConfig.cmake)
@@ -40,6 +118,8 @@ endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
 INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR}  ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
 LINK_DIRECTORIES(${PROJECTM_LINK} ${JACK_LDFLAGS})
 
-TARGET_LINK_LIBRARIES(projectM-jack projectM  jack  ${SDL_LIBRARY} ${GTK_LIBRARIES})
+TARGET_LINK_LIBRARIES(projectM-jack projectM jack  ${SDL_LIBRARY} ${GTK_LIBRARIES})
+
+INSTALL(TARGETS projectM-jack DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+endif(USE_PROJECTM_QT)
 
-INSTALL(TARGETS projectM-jack DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
\ No newline at end of file
diff --git a/src/qprojectM-jack/qprojectM-jack.cpp b/src/projectM-jack/qprojectM-jack.cpp
similarity index 100%
rename from src/qprojectM-jack/qprojectM-jack.cpp
rename to src/projectM-jack/qprojectM-jack.cpp
diff --git a/src/qprojectM-pulseaudio/AUTHORS b/src/projectM-pulseaudio/AUTHORS
similarity index 100%
rename from src/qprojectM-pulseaudio/AUTHORS
rename to src/projectM-pulseaudio/AUTHORS
diff --git a/src/qprojectM-pulseaudio/CMakeLists.txt b/src/projectM-pulseaudio/CMakeLists.txt
similarity index 63%
rename from src/qprojectM-pulseaudio/CMakeLists.txt
rename to src/projectM-pulseaudio/CMakeLists.txt
index 1cdd43873..84918ecef 100644
--- a/src/qprojectM-pulseaudio/CMakeLists.txt
+++ b/src/projectM-pulseaudio/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(qprojectM-pulseaudio)
+PROJECT(projectM-pulseaudio)
 
 set(QT_USE_OPENGL TRUE)
 
@@ -8,10 +8,10 @@ include(${QT_USE_FILE} FindPkgConfig.cmake)
 
 if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
 	pkg_search_module(LIBPROJECTM REQUIRED libprojectM)
-	pkg_search_module(LIBQPROJECTM REQUIRED libqprojectM)
+	pkg_search_module(LIBPROJECTM-QT REQUIRED libprojectM-qt)
 else(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
 	set(LIBPROJECTM_FOUND true)
-	set(LIBQPROJECTM_FOUND true)
+	set(LIBPROJECTM_QT_FOUND true)
 endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
 
 FIND_PACKAGE(OpenGL)
@@ -26,11 +26,11 @@ else(LIBPROJECTM_FOUND)
 MESSAGE (FATAL_ERROR "projectM NOT detected. Please install the projectM module or build from the top level projectM source directory.")
 endif(LIBPROJECTM_FOUND)
 
-if (LIBQPROJECTM_FOUND)
-MESSAGE (STATUS "qprojectM detected.")
-else(LIBQPROJECTM_FOUND)
-MESSAGE (FATAL_ERROR "qprojectM NOT detected. Please install the qprojectM module or build from the top level projectM source directory.")
-endif(LIBQPROJECTM_FOUND)
+if (LIBPROJECTM_QT_FOUND)
+MESSAGE (STATUS "projectM-qt detected.")
+else(LIBPROJECTM_QT_FOUND)
+MESSAGE (FATAL_ERROR "projectM-qt NOT detected. Please install the qprojectM module or build from the top level projectM source directory.")
+endif(LIBPROJECTM_QT_FOUND)
 
 if (LIBPULSE_FOUND)
 MESSAGE(STATUS "Pulse audio detected")
@@ -39,24 +39,23 @@ MESSAGE(FATAL_ERROR "ERROR: Pulse Audio is NOT found. Please install pulse audio
 endif(LIBPULSE_FOUND)
 
 
-# the variable "qprojectM_SRCS" contains all .cpp files of this project
-set(qprojectM_pulseaudio_SRCS
+set(projectM_pulseaudio_SRCS
   qprojectM-pulseaudio.cpp ConfigFile.h ConfigFile.cpp QPulseAudioThread.cpp QPulseAudioDeviceChooser.cpp QPulseAudioDeviceModel.cpp
 )
 
-set(qprojectM_pulseaudio_MOC_HDRS
+set(projectM_pulseaudio_MOC_HDRS
 	QPulseAudioThread.hpp QPulseAudioDeviceChooser.hpp QPulseAudioDeviceModel.hpp
 )
 
-set(qprojectM_pulseaudio_UIS
+set(projectM_pulseaudio_UIS
     PulseDeviceChooserDialog.ui
 )
 
 
-qt4_wrap_ui(qprojectM_pulseaudio_UIS_H ${qprojectM_pulseaudio_UIS})
+qt4_wrap_ui(projectM_pulseaudio_UIS_H ${projectM_pulseaudio_UIS})
 
 # After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx.
-qt4_wrap_cpp(qprojectM_pulseaudio_MOC_SRCS ${qprojectM_pulseaudio_MOC_HDRS})
+qt4_wrap_cpp(projectM_pulseaudio_MOC_SRCS ${projectM_pulseaudio_MOC_HDRS})
 
 ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"')
 ADD_DEFINITIONS(${QT_DEFINITIONS})
@@ -64,12 +63,12 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG)
 
 
 if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
-   set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/qprojectM)
-   set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/qprojectM)
+   set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt)
+   set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt)
 elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
-   set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM ${LIBQPROJECTM_INCLUDEDIR}/libqprojectM)
+   set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM ${LIBQPROJECTM_INCLUDEDIR}/libprojectM-qt)
    set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBQPROJECTM_LDFLAGS})
-# qprojectM places itself in same location as (lib)projectM 
+# projectM-qt places itself in same location as (lib)projectM 
 # whether it should is a whole other issue
 endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
 
@@ -77,8 +76,8 @@ INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR
 
 LINK_DIRECTORIES(${PROJECTM_LINK} ${PULSEAUDIO_LDFLAGS})
 
-ADD_EXECUTABLE(qprojectM-pulseaudio ${qprojectM_pulseaudio_SRCS} ${qprojectM_pulseaudio_MOC_SRCS} ${qprojectM_pulseaudio_UIS_H})
+ADD_EXECUTABLE(projectM-pulseaudio ${projectM_pulseaudio_SRCS} ${projectM_pulseaudio_MOC_SRCS} ${projectM_pulseaudio_UIS_H})
 
-TARGET_LINK_LIBRARIES(qprojectM-pulseaudio qprojectM projectM pulse ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTCORE_LIBRARIES} ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(projectM-pulseaudio libprojectM-qt projectM pulse ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTCORE_LIBRARIES} ${QT_LIBRARIES})
 
-INSTALL(TARGETS qprojectM-pulseaudio DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
\ No newline at end of file
+INSTALL(TARGETS projectM-pulseaudio DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
diff --git a/src/qprojectM-pulseaudio/COPYING b/src/projectM-pulseaudio/COPYING
similarity index 100%
rename from src/qprojectM-pulseaudio/COPYING
rename to src/projectM-pulseaudio/COPYING
diff --git a/src/qprojectM-pulseaudio/ChangeLog b/src/projectM-pulseaudio/ChangeLog
similarity index 100%
rename from src/qprojectM-pulseaudio/ChangeLog
rename to src/projectM-pulseaudio/ChangeLog
diff --git a/src/qprojectM-pulseaudio/ConfigFile.cpp b/src/projectM-pulseaudio/ConfigFile.cpp
similarity index 100%
rename from src/qprojectM-pulseaudio/ConfigFile.cpp
rename to src/projectM-pulseaudio/ConfigFile.cpp
diff --git a/src/qprojectM-pulseaudio/ConfigFile.h b/src/projectM-pulseaudio/ConfigFile.h
similarity index 100%
rename from src/qprojectM-pulseaudio/ConfigFile.h
rename to src/projectM-pulseaudio/ConfigFile.h
diff --git a/src/qprojectM-pulseaudio/FindPkgConfig.cmake b/src/projectM-pulseaudio/FindPkgConfig.cmake
similarity index 100%
rename from src/qprojectM-pulseaudio/FindPkgConfig.cmake
rename to src/projectM-pulseaudio/FindPkgConfig.cmake
diff --git a/src/qprojectM-pulseaudio/INSTALL b/src/projectM-pulseaudio/INSTALL
similarity index 100%
rename from src/qprojectM-pulseaudio/INSTALL
rename to src/projectM-pulseaudio/INSTALL
diff --git a/src/qprojectM-pulseaudio/NEWS b/src/projectM-pulseaudio/NEWS
similarity index 100%
rename from src/qprojectM-pulseaudio/NEWS
rename to src/projectM-pulseaudio/NEWS
diff --git a/src/qprojectM-pulseaudio/PulseDeviceChooserDialog.ui b/src/projectM-pulseaudio/PulseDeviceChooserDialog.ui
similarity index 100%
rename from src/qprojectM-pulseaudio/PulseDeviceChooserDialog.ui
rename to src/projectM-pulseaudio/PulseDeviceChooserDialog.ui
diff --git a/src/qprojectM-pulseaudio/QPulseAudioDeviceChooser.cpp b/src/projectM-pulseaudio/QPulseAudioDeviceChooser.cpp
similarity index 100%
rename from src/qprojectM-pulseaudio/QPulseAudioDeviceChooser.cpp
rename to src/projectM-pulseaudio/QPulseAudioDeviceChooser.cpp
diff --git a/src/qprojectM-pulseaudio/QPulseAudioDeviceChooser.hpp b/src/projectM-pulseaudio/QPulseAudioDeviceChooser.hpp
similarity index 100%
rename from src/qprojectM-pulseaudio/QPulseAudioDeviceChooser.hpp
rename to src/projectM-pulseaudio/QPulseAudioDeviceChooser.hpp
diff --git a/src/qprojectM-pulseaudio/QPulseAudioDeviceModel.cpp b/src/projectM-pulseaudio/QPulseAudioDeviceModel.cpp
similarity index 100%
rename from src/qprojectM-pulseaudio/QPulseAudioDeviceModel.cpp
rename to src/projectM-pulseaudio/QPulseAudioDeviceModel.cpp
diff --git a/src/qprojectM-pulseaudio/QPulseAudioDeviceModel.hpp b/src/projectM-pulseaudio/QPulseAudioDeviceModel.hpp
similarity index 100%
rename from src/qprojectM-pulseaudio/QPulseAudioDeviceModel.hpp
rename to src/projectM-pulseaudio/QPulseAudioDeviceModel.hpp
diff --git a/src/qprojectM-pulseaudio/QPulseAudioThread.cpp b/src/projectM-pulseaudio/QPulseAudioThread.cpp
similarity index 100%
rename from src/qprojectM-pulseaudio/QPulseAudioThread.cpp
rename to src/projectM-pulseaudio/QPulseAudioThread.cpp
diff --git a/src/qprojectM-pulseaudio/QPulseAudioThread.hpp b/src/projectM-pulseaudio/QPulseAudioThread.hpp
similarity index 100%
rename from src/qprojectM-pulseaudio/QPulseAudioThread.hpp
rename to src/projectM-pulseaudio/QPulseAudioThread.hpp
diff --git a/src/qprojectM-pulseaudio/README b/src/projectM-pulseaudio/README
similarity index 100%
rename from src/qprojectM-pulseaudio/README
rename to src/projectM-pulseaudio/README
diff --git a/src/qprojectM-pulseaudio/depcomp b/src/projectM-pulseaudio/depcomp
similarity index 100%
rename from src/qprojectM-pulseaudio/depcomp
rename to src/projectM-pulseaudio/depcomp
diff --git a/src/qprojectM-pulseaudio/missing b/src/projectM-pulseaudio/missing
similarity index 100%
rename from src/qprojectM-pulseaudio/missing
rename to src/projectM-pulseaudio/missing
diff --git a/src/qprojectM-pulseaudio/qprojectM-pulseaudio.cpp b/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
similarity index 100%
rename from src/qprojectM-pulseaudio/qprojectM-pulseaudio.cpp
rename to src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
diff --git a/src/qprojectM/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt
similarity index 74%
rename from src/qprojectM/CMakeLists.txt
rename to src/projectM-qt/CMakeLists.txt
index 379604095..4f77388c5 100644
--- a/src/qprojectM/CMakeLists.txt
+++ b/src/projectM-qt/CMakeLists.txt
@@ -1,6 +1,6 @@
 # the next line sets up include and link directories and defines some variables that we will use.
 # you can modify the behavior by setting some variables, e.g.
-project(qprojectM) # the name of your project
+project(projectM-qt) # the name of your project
 
 cmake_minimum_required(VERSION 2.4.0)
 
@@ -30,7 +30,7 @@ else (LIBPROJECTM_FOUND)
 endif(LIBPROJECTM_FOUND)
 
 
-CONFIGURE_FILE("libqprojectM.pc.in" "libqprojectM.pc" @ONLY)
+CONFIGURE_FILE("libprojectM-qt.pc.in" "libprojectM-qt.pc" @ONLY)
 
 ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"')
 ADD_DEFINITIONS(${QT_DEFINITIONS})
@@ -38,8 +38,8 @@ ADD_DEFINITIONS(-DQT_PLUGIN)
 ADD_DEFINITIONS(-DQT_NO_DEBUG)
 ADD_DEFINITIONS(-DQT_SHARED)
 
-# the variable "qprojectM_SRCS" contains all .cpp files of this project
-set(qprojectM_SRCS
+# the variable "projectM-qt_SRCS" contains all .cpp files of this project
+set(projectM-qt_SRCS
     qprojectm_mainwindow.cpp
     qprojectm_mainwindow.hpp
     configfile.hpp configfile.cpp
@@ -61,7 +61,7 @@ set(qprojectM_SRCS
 )
 
 
-set(qprojectM_MOC_HDRS
+set(projectM-qt_MOC_HDRS
     qprojectm_mainwindow.hpp
     qpresetfiledialog.hpp
     qplaylistfiledialog.hpp
@@ -74,28 +74,28 @@ set(qprojectM_MOC_HDRS
     qprojectmwidget.hpp
 )
 
-set(qprojectM_UIS
+set(projectM-qt_UIS
     qprojectm_mainwindow.ui
     qprojectmconfigdialog.ui
     qpreseteditordialog.ui
 )
 
 # Qt resource file
-set( qprojectM_RESOURCES
+set( projectM-qt_RESOURCES
     application.qrc
 )
 
 # compile resources
-qt4_add_resources( qprojectM_RC_SRCS ${qprojectM_RESOURCES} )
+qt4_add_resources( projectM-qt_RC_SRCS ${projectM-qt_RESOURCES} )
 
-qt4_wrap_ui(qprojectM_UIS_H ${qprojectM_UIS})
+qt4_wrap_ui(projectM-qt_UIS_H ${projectM-qt_UIS})
 
 # After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx.
-qt4_wrap_cpp(qprojectM_MOC_SRCS ${qprojectM_MOC_HDRS})
+qt4_wrap_cpp(projectM-qt_MOC_SRCS ${projectM-qt_MOC_HDRS})
 
-ADD_LIBRARY(qprojectM SHARED ${qprojectM_SRCS} ${qprojectM_RC_SRCS} ${qprojectM_MOC_SRCS} ${qprojectM_UIS_H})
+ADD_LIBRARY(projectM-qt SHARED ${projectM-qt_SRCS} ${projectM-qt_RC_SRCS} ${projectM-qt_MOC_SRCS} ${projectM-qt_UIS_H})
 
-SET_TARGET_PROPERTIES(qprojectM PROPERTIES VERSION 1.10 SOVERSION 1)
+SET_TARGET_PROPERTIES(projectM-qt PROPERTIES VERSION 1.10 SOVERSION 1)
 
 if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
    set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine)
@@ -110,8 +110,8 @@ LINK_DIRECTORIES(${PROJECTM_LINK})
 include_directories(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${CMAKE_CURRENT_LIBRARY_DIR})
 
 # link the "qprojectM" target against the Qt libraries. which libraries exactly, is defined by the "include(${QT_USE_FILE})" line above, which sets up this variable.
-target_link_libraries(qprojectM projectM ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})
+target_link_libraries(projectM-qt projectM ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})
 
-install(FILES qprojectm_mainwindow.hpp DESTINATION include/libqprojectM)
-install(TARGETS qprojectM DESTINATION lib)
-install(FILES "${CMAKE_BINARY_DIR}/libqprojectM.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
+install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt)
+install(TARGETS projectM-qt DESTINATION lib)
+install(FILES "${CMAKE_BINARY_DIR}/libprojectM-qt.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
diff --git a/src/qprojectM/FindPkgConfig.cmake b/src/projectM-qt/FindPkgConfig.cmake
similarity index 100%
rename from src/qprojectM/FindPkgConfig.cmake
rename to src/projectM-qt/FindPkgConfig.cmake
diff --git a/src/qprojectM/ReadMe b/src/projectM-qt/ReadMe
similarity index 100%
rename from src/qprojectM/ReadMe
rename to src/projectM-qt/ReadMe
diff --git a/src/qprojectM/application.qrc b/src/projectM-qt/application.qrc
similarity index 100%
rename from src/qprojectM/application.qrc
rename to src/projectM-qt/application.qrc
diff --git a/src/qprojectM/configfile.cpp b/src/projectM-qt/configfile.cpp
similarity index 100%
rename from src/qprojectM/configfile.cpp
rename to src/projectM-qt/configfile.cpp
diff --git a/src/qprojectM/configfile.hpp b/src/projectM-qt/configfile.hpp
similarity index 100%
rename from src/qprojectM/configfile.hpp
rename to src/projectM-qt/configfile.hpp
diff --git a/src/qprojectM/images/icons/CMakeLists.txt b/src/projectM-qt/images/icons/CMakeLists.txt
similarity index 100%
rename from src/qprojectM/images/icons/CMakeLists.txt
rename to src/projectM-qt/images/icons/CMakeLists.txt
diff --git a/src/qprojectM/images/icons/face0.png b/src/projectM-qt/images/icons/face0.png
similarity index 100%
rename from src/qprojectM/images/icons/face0.png
rename to src/projectM-qt/images/icons/face0.png
diff --git a/src/qprojectM/images/icons/face1.png b/src/projectM-qt/images/icons/face1.png
similarity index 100%
rename from src/qprojectM/images/icons/face1.png
rename to src/projectM-qt/images/icons/face1.png
diff --git a/src/qprojectM/images/icons/face2.png b/src/projectM-qt/images/icons/face2.png
similarity index 100%
rename from src/qprojectM/images/icons/face2.png
rename to src/projectM-qt/images/icons/face2.png
diff --git a/src/qprojectM/images/icons/face3.png b/src/projectM-qt/images/icons/face3.png
similarity index 100%
rename from src/qprojectM/images/icons/face3.png
rename to src/projectM-qt/images/icons/face3.png
diff --git a/src/qprojectM/images/icons/face4.png b/src/projectM-qt/images/icons/face4.png
similarity index 100%
rename from src/qprojectM/images/icons/face4.png
rename to src/projectM-qt/images/icons/face4.png
diff --git a/src/qprojectM/images/icons/face5.png b/src/projectM-qt/images/icons/face5.png
similarity index 100%
rename from src/qprojectM/images/icons/face5.png
rename to src/projectM-qt/images/icons/face5.png
diff --git a/src/qprojectM/images/icons/hi16-action-collection.png b/src/projectM-qt/images/icons/hi16-action-collection.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-collection.png
rename to src/projectM-qt/images/icons/hi16-action-collection.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_add_playlist.png b/src/projectM-qt/images/icons/hi16-action-projectm_add_playlist.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_add_playlist.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_add_playlist.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_album.png b/src/projectM-qt/images/icons/hi16-action-projectm_album.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_album.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_album.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_artist.png b/src/projectM-qt/images/icons/hi16-action-projectm_artist.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_artist.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_artist.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_back.png b/src/projectM-qt/images/icons/hi16-action-projectm_back.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_back.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_back.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_burn.png b/src/projectM-qt/images/icons/hi16-action-projectm_burn.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_burn.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_burn.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_change_language.png b/src/projectM-qt/images/icons/hi16-action-projectm_change_language.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_change_language.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_change_language.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_circle.png b/src/projectM-qt/images/icons/hi16-action-projectm_circle.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_circle.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_circle.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_collection.png b/src/projectM-qt/images/icons/hi16-action-projectm_collection.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_collection.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_collection.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_configure.png b/src/projectM-qt/images/icons/hi16-action-projectm_configure.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_configure.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_configure.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_download.png b/src/projectM-qt/images/icons/hi16-action-projectm_download.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_download.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_download.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_dynamic.png b/src/projectM-qt/images/icons/hi16-action-projectm_dynamic.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_dynamic.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_dynamic.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_edit.png b/src/projectM-qt/images/icons/hi16-action-projectm_edit.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_edit.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_edit.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_editcopy.png b/src/projectM-qt/images/icons/hi16-action-projectm_editcopy.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_editcopy.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_editcopy.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_equalizer.png b/src/projectM-qt/images/icons/hi16-action-projectm_equalizer.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_equalizer.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_equalizer.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_external.png b/src/projectM-qt/images/icons/hi16-action-projectm_external.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_external.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_external.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_fastforward.png b/src/projectM-qt/images/icons/hi16-action-projectm_fastforward.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_fastforward.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_fastforward.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_favourite_genres.png b/src/projectM-qt/images/icons/hi16-action-projectm_favourite_genres.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_favourite_genres.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_favourite_genres.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_files.png b/src/projectM-qt/images/icons/hi16-action-projectm_files.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_files.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_files.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_files2.png b/src/projectM-qt/images/icons/hi16-action-projectm_files2.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_files2.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_files2.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_info.png b/src/projectM-qt/images/icons/hi16-action-projectm_info.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_info.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_info.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_jamendo.png b/src/projectM-qt/images/icons/hi16-action-projectm_jamendo.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_jamendo.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_jamendo.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_lock.png b/src/projectM-qt/images/icons/hi16-action-projectm_lock.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_lock.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_lock.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_mostplayed.png b/src/projectM-qt/images/icons/hi16-action-projectm_mostplayed.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_mostplayed.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_mostplayed.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_music.png b/src/projectM-qt/images/icons/hi16-action-projectm_music.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_music.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_music.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_next.png b/src/projectM-qt/images/icons/hi16-action-projectm_next.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_next.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_next.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_pause.png b/src/projectM-qt/images/icons/hi16-action-projectm_pause.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_pause.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_pause.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_play.png b/src/projectM-qt/images/icons/hi16-action-projectm_play.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_play.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_play.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_playlist.png b/src/projectM-qt/images/icons/hi16-action-projectm_playlist.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_playlist.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_playlist.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_playlist_clear.png b/src/projectM-qt/images/icons/hi16-action-projectm_playlist_clear.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_playlist_clear.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_playlist_clear.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_playlist_refresh.png b/src/projectM-qt/images/icons/hi16-action-projectm_playlist_refresh.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_playlist_refresh.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_playlist_refresh.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_queue.png b/src/projectM-qt/images/icons/hi16-action-projectm_queue.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_queue.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_queue.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_random.png b/src/projectM-qt/images/icons/hi16-action-projectm_random.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_random.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_random.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_random_album.png b/src/projectM-qt/images/icons/hi16-action-projectm_random_album.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_random_album.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_random_album.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_random_no.png b/src/projectM-qt/images/icons/hi16-action-projectm_random_no.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_random_no.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_random_no.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_random_track.png b/src/projectM-qt/images/icons/hi16-action-projectm_random_track.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_random_track.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_random_track.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_redo.png b/src/projectM-qt/images/icons/hi16-action-projectm_redo.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_redo.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_redo.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_refresh.png b/src/projectM-qt/images/icons/hi16-action-projectm_refresh.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_refresh.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_refresh.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_remove.png b/src/projectM-qt/images/icons/hi16-action-projectm_remove.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_remove.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_remove.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_remove_from_playlist.png b/src/projectM-qt/images/icons/hi16-action-projectm_remove_from_playlist.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_remove_from_playlist.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_remove_from_playlist.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_repeat_album.png b/src/projectM-qt/images/icons/hi16-action-projectm_repeat_album.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_repeat_album.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_repeat_album.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_repeat_no.png b/src/projectM-qt/images/icons/hi16-action-projectm_repeat_no.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_repeat_no.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_repeat_no.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_repeat_playlist.png b/src/projectM-qt/images/icons/hi16-action-projectm_repeat_playlist.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_repeat_playlist.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_repeat_playlist.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_repeat_track.png b/src/projectM-qt/images/icons/hi16-action-projectm_repeat_track.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_repeat_track.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_repeat_track.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_rescan.png b/src/projectM-qt/images/icons/hi16-action-projectm_rescan.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_rescan.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_rescan.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_rewind.png b/src/projectM-qt/images/icons/hi16-action-projectm_rewind.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_rewind.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_rewind.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_save.png b/src/projectM-qt/images/icons/hi16-action-projectm_save.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_save.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_save.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_scripts.png b/src/projectM-qt/images/icons/hi16-action-projectm_scripts.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_scripts.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_scripts.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_search.png b/src/projectM-qt/images/icons/hi16-action-projectm_search.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_search.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_search.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_settings_engine.png b/src/projectM-qt/images/icons/hi16-action-projectm_settings_engine.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_settings_engine.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_settings_engine.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_settings_general.png b/src/projectM-qt/images/icons/hi16-action-projectm_settings_general.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_settings_general.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_settings_general.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_settings_indicator.png b/src/projectM-qt/images/icons/hi16-action-projectm_settings_indicator.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_settings_indicator.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_settings_indicator.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_settings_playback.png b/src/projectM-qt/images/icons/hi16-action-projectm_settings_playback.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_settings_playback.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_settings_playback.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_settings_view.png b/src/projectM-qt/images/icons/hi16-action-projectm_settings_view.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_settings_view.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_settings_view.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_stop.png b/src/projectM-qt/images/icons/hi16-action-projectm_stop.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_stop.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_stop.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_track.png b/src/projectM-qt/images/icons/hi16-action-projectm_track.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_track.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_track.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_undo.png b/src/projectM-qt/images/icons/hi16-action-projectm_undo.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_undo.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_undo.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_unlock.png b/src/projectM-qt/images/icons/hi16-action-projectm_unlock.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_unlock.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_unlock.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_visualizations.png b/src/projectM-qt/images/icons/hi16-action-projectm_visualizations.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_visualizations.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_visualizations.png
diff --git a/src/qprojectM/images/icons/hi16-action-projectm_zoom.png b/src/projectM-qt/images/icons/hi16-action-projectm_zoom.png
similarity index 100%
rename from src/qprojectM/images/icons/hi16-action-projectm_zoom.png
rename to src/projectM-qt/images/icons/hi16-action-projectm_zoom.png
diff --git a/src/qprojectM/images/icons/prjm16-transparent.svg b/src/projectM-qt/images/icons/prjm16-transparent.svg
similarity index 100%
rename from src/qprojectM/images/icons/prjm16-transparent.svg
rename to src/projectM-qt/images/icons/prjm16-transparent.svg
diff --git a/src/qprojectM/images/icons/rating-1.png b/src/projectM-qt/images/icons/rating-1.png
similarity index 100%
rename from src/qprojectM/images/icons/rating-1.png
rename to src/projectM-qt/images/icons/rating-1.png
diff --git a/src/qprojectM/images/icons/rating-2.png b/src/projectM-qt/images/icons/rating-2.png
similarity index 100%
rename from src/qprojectM/images/icons/rating-2.png
rename to src/projectM-qt/images/icons/rating-2.png
diff --git a/src/qprojectM/images/icons/rating-3.png b/src/projectM-qt/images/icons/rating-3.png
similarity index 100%
rename from src/qprojectM/images/icons/rating-3.png
rename to src/projectM-qt/images/icons/rating-3.png
diff --git a/src/qprojectM/images/icons/rating-4.png b/src/projectM-qt/images/icons/rating-4.png
similarity index 100%
rename from src/qprojectM/images/icons/rating-4.png
rename to src/projectM-qt/images/icons/rating-4.png
diff --git a/src/qprojectM/images/icons/rating-5.png b/src/projectM-qt/images/icons/rating-5.png
similarity index 100%
rename from src/qprojectM/images/icons/rating-5.png
rename to src/projectM-qt/images/icons/rating-5.png
diff --git a/src/qprojectM/libqprojectM.pc.in b/src/projectM-qt/libqprojectM.pc.in
similarity index 100%
rename from src/qprojectM/libqprojectM.pc.in
rename to src/projectM-qt/libqprojectM.pc.in
diff --git a/src/qprojectM/nullable.hpp b/src/projectM-qt/nullable.hpp
similarity index 100%
rename from src/qprojectM/nullable.hpp
rename to src/projectM-qt/nullable.hpp
diff --git a/src/qprojectM/qplaylistfiledialog.cpp b/src/projectM-qt/qplaylistfiledialog.cpp
similarity index 100%
rename from src/qprojectM/qplaylistfiledialog.cpp
rename to src/projectM-qt/qplaylistfiledialog.cpp
diff --git a/src/qprojectM/qplaylistfiledialog.hpp b/src/projectM-qt/qplaylistfiledialog.hpp
similarity index 100%
rename from src/qprojectM/qplaylistfiledialog.hpp
rename to src/projectM-qt/qplaylistfiledialog.hpp
diff --git a/src/qprojectM/qplaylistmodel.cpp b/src/projectM-qt/qplaylistmodel.cpp
similarity index 100%
rename from src/qprojectM/qplaylistmodel.cpp
rename to src/projectM-qt/qplaylistmodel.cpp
diff --git a/src/qprojectM/qplaylistmodel.hpp b/src/projectM-qt/qplaylistmodel.hpp
similarity index 100%
rename from src/qprojectM/qplaylistmodel.hpp
rename to src/projectM-qt/qplaylistmodel.hpp
diff --git a/src/qprojectM/qplaylisttableview.hpp b/src/projectM-qt/qplaylisttableview.hpp
similarity index 100%
rename from src/qprojectM/qplaylisttableview.hpp
rename to src/projectM-qt/qplaylisttableview.hpp
diff --git a/src/qprojectM/qpreseteditordialog.cpp b/src/projectM-qt/qpreseteditordialog.cpp
similarity index 100%
rename from src/qprojectM/qpreseteditordialog.cpp
rename to src/projectM-qt/qpreseteditordialog.cpp
diff --git a/src/qprojectM/qpreseteditordialog.hpp b/src/projectM-qt/qpreseteditordialog.hpp
similarity index 100%
rename from src/qprojectM/qpreseteditordialog.hpp
rename to src/projectM-qt/qpreseteditordialog.hpp
diff --git a/src/qprojectM/qpreseteditordialog.ui b/src/projectM-qt/qpreseteditordialog.ui
similarity index 100%
rename from src/qprojectM/qpreseteditordialog.ui
rename to src/projectM-qt/qpreseteditordialog.ui
diff --git a/src/qprojectM/qpresetfiledialog.hpp b/src/projectM-qt/qpresetfiledialog.hpp
similarity index 100%
rename from src/qprojectM/qpresetfiledialog.hpp
rename to src/projectM-qt/qpresetfiledialog.hpp
diff --git a/src/qprojectM/qpresettextedit.cpp b/src/projectM-qt/qpresettextedit.cpp
similarity index 100%
rename from src/qprojectM/qpresettextedit.cpp
rename to src/projectM-qt/qpresettextedit.cpp
diff --git a/src/qprojectM/qpresettextedit.hpp b/src/projectM-qt/qpresettextedit.hpp
similarity index 100%
rename from src/qprojectM/qpresettextedit.hpp
rename to src/projectM-qt/qpresettextedit.hpp
diff --git a/src/qprojectM/qprojectm.hpp b/src/projectM-qt/qprojectm.hpp
similarity index 100%
rename from src/qprojectM/qprojectm.hpp
rename to src/projectM-qt/qprojectm.hpp
diff --git a/src/qprojectM/qprojectm_mainwindow.cpp b/src/projectM-qt/qprojectm_mainwindow.cpp
similarity index 100%
rename from src/qprojectM/qprojectm_mainwindow.cpp
rename to src/projectM-qt/qprojectm_mainwindow.cpp
diff --git a/src/qprojectM/qprojectm_mainwindow.hpp b/src/projectM-qt/qprojectm_mainwindow.hpp
similarity index 100%
rename from src/qprojectM/qprojectm_mainwindow.hpp
rename to src/projectM-qt/qprojectm_mainwindow.hpp
diff --git a/src/qprojectM/qprojectm_mainwindow.ui b/src/projectM-qt/qprojectm_mainwindow.ui
similarity index 100%
rename from src/qprojectM/qprojectm_mainwindow.ui
rename to src/projectM-qt/qprojectm_mainwindow.ui
diff --git a/src/qprojectM/qprojectmconfigdialog.cpp b/src/projectM-qt/qprojectmconfigdialog.cpp
similarity index 100%
rename from src/qprojectM/qprojectmconfigdialog.cpp
rename to src/projectM-qt/qprojectmconfigdialog.cpp
diff --git a/src/qprojectM/qprojectmconfigdialog.hpp b/src/projectM-qt/qprojectmconfigdialog.hpp
similarity index 100%
rename from src/qprojectM/qprojectmconfigdialog.hpp
rename to src/projectM-qt/qprojectmconfigdialog.hpp
diff --git a/src/qprojectM/qprojectmconfigdialog.ui b/src/projectM-qt/qprojectmconfigdialog.ui
similarity index 100%
rename from src/qprojectM/qprojectmconfigdialog.ui
rename to src/projectM-qt/qprojectmconfigdialog.ui
diff --git a/src/qprojectM/qprojectmwidget.hpp b/src/projectM-qt/qprojectmwidget.hpp
similarity index 100%
rename from src/qprojectM/qprojectmwidget.hpp
rename to src/projectM-qt/qprojectmwidget.hpp
diff --git a/src/qprojectM/qxmlplaylisthandler.hpp b/src/projectM-qt/qxmlplaylisthandler.hpp
similarity index 100%
rename from src/qprojectM/qxmlplaylisthandler.hpp
rename to src/projectM-qt/qxmlplaylisthandler.hpp
diff --git a/src/qprojectM/src.pro b/src/projectM-qt/src.pro
similarity index 100%
rename from src/qprojectM/src.pro
rename to src/projectM-qt/src.pro
diff --git a/src/qprojectM/templates/cpp b/src/projectM-qt/templates/cpp
similarity index 100%
rename from src/qprojectM/templates/cpp
rename to src/projectM-qt/templates/cpp
diff --git a/src/qprojectM/templates/h b/src/projectM-qt/templates/h
similarity index 100%
rename from src/qprojectM/templates/h
rename to src/projectM-qt/templates/h