diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2f29884..c2f5079a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,11 +19,16 @@ if(NOT INSIDE_KDENETWORK)
     include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 endif(NOT INSIDE_KDENETWORK)
 
-check_symbol_exists(rfbInitServer  "rfb/rfb.h"     HAVE_LIBVNCSERVER)
+# FIXME: Can we merge this check back into FindLibVNCServer.cmake?
+check_symbol_exists(rfbInitServer "rfb/rfb.h" HAVE_LIBVNCSERVER)
+
 macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE)
 macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-krfb.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krfb.h )
-include_directories(${CMAKE_CURRENT_BINARY_DIR}) # for config-krfb.h
+
+include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
+                     "${CMAKE_CURRENT_SOURCE_DIR}/krfb"
+                     "${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
+)
 
 if(Q_WS_X11)
   if(NOT X11_XTest_FOUND)
@@ -31,107 +36,10 @@ if(Q_WS_X11)
   endif(NOT X11_XTest_FOUND)
 endif(Q_WS_X11)
 
-#add_subdirectory(kinetd)
-#add_subdirectory(kcm_krfb)
 if (HAVE_LIBVNCSERVER)
-
-#####################################
-# First target: libkrfb - a library
-# for linking plugins against.
-
-set (krfbprivate_SRCS
-     framebuffer.cpp
-     framebufferplugin.cpp
-)
-
-kde4_add_library (krfbprivate
-                  SHARED
-                  ${krfbprivate_SRCS}
-)
-
-target_link_libraries (krfbprivate
-                       ${QT_QTCORE_LIBRARY}
-                       ${QT_QTGUI_LIBRARY}
-                       ${X11_X11_LIB}
-                       ${LIBVNCSERVER_LIBRARIES}
-)
-
-set_target_properties (krfbprivate PROPERTIES
-                       VERSION ${GENERIC_LIB_VERSION}
-                       SOVERSION ${GENERIC_LIB_VERSION}
-)
-
-install (TARGETS krfbprivate
-         ${INSTALL_TARGETS_DEFAULT_ARGS}
-)
-
-install (FILES
-         krfb-framebuffer.desktop
-         DESTINATION ${SERVICETYPES_INSTALL_DIR}
-)
-
-#####################################
-# Build the plugins
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-add_subdirectory (framebuffers)
-
-#####################################
-# Second target: krfb - the app
-# itself.
-
-set(krfb_SRCS
-   main.cpp
-   trayicon.cpp
-   manageinvitationsdialog.cpp
-   invitationmanager.cpp
-   invitedialog.cpp
-   invitation.cpp
-   connectiondialog.cpp
-   personalinvitedialog.cpp
-   events.cpp
-   framebuffermanager.cpp
-   servermanager.cpp
-   sockethelpers.cpp
-   abstractrfbserver.cpp
-   abstractconnectioncontroller.cpp
-   krfbserver.cpp
-   krfbconnectioncontroller.cpp
-)
-
-kde4_add_kcfg_files(krfb_SRCS krfbconfig.kcfgc)
-
-kde4_add_ui_files(krfb_SRCS connectionwidget.ui
-        manageinvitations.ui
-        personalinvitewidget.ui
-        invitewidget.ui
-        configtcp.ui
-        configsecurity.ui
-        )
-
-kde4_add_executable(krfb ${krfb_SRCS})
-
-target_link_libraries(krfb
-                      krfbprivate
-                      ${JPEG_LIBRARIES}
-                      ${LIBVNCSERVER_LIBRARIES}
-                      ${X11_Xext_LIB}
-                      ${X11_X11_LIB}
-                      ${X11_Xdamage_LIB}
-                      ${QT_QTNETWORK_LIBRARY}
-                      ${KDE4_KDNSSD_LIBS}
-                      ${KDE4_KDEUI_LIBS}
-)
-
-if(X11_XTest_FOUND)
-  target_link_libraries(krfb ${X11_XTest_LIB})
-endif(X11_XTest_FOUND)
-
-install(TARGETS krfb  ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-########### install files ###############
-
-install(PROGRAMS krfb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install(FILES krfb.notifyrc DESTINATION ${DATA_INSTALL_DIR}/krfb)
-
+    #add_subdirectory(kinetd)
+    #add_subdirectory(kcm_krfb)
+    add_subdirectory(krfb)
+    add_subdirectory (framebuffers)
 endif (HAVE_LIBVNCSERVER)
+
diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt
new file mode 100644
index 00000000..972b77e7
--- /dev/null
+++ b/krfb/CMakeLists.txt
@@ -0,0 +1,111 @@
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config-krfb.h.cmake
+                ${CMAKE_CURRENT_BINARY_DIR}/config-krfb.h
+)
+
+#####################################
+# First target: libkrfbprivate - a library
+# for linking plugins against.
+
+set (krfbprivate_SRCS
+     framebuffer.cpp
+     framebufferplugin.cpp
+)
+
+kde4_add_library (krfbprivate
+                  SHARED
+                  ${krfbprivate_SRCS}
+)
+
+target_link_libraries (krfbprivate
+                       ${QT_QTCORE_LIBRARY}
+                       ${QT_QTGUI_LIBRARY}
+                       ${X11_X11_LIB}
+                       ${LIBVNCSERVER_LIBRARIES}
+)
+
+set_target_properties (krfbprivate PROPERTIES
+                       VERSION ${GENERIC_LIB_VERSION}
+                       SOVERSION ${GENERIC_LIB_VERSION}
+)
+
+install (TARGETS krfbprivate
+         ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+install (FILES
+         krfb-framebuffer.desktop
+         DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
+
+#####################################
+# Second target: krfb - the app
+# itself.
+
+set (krfb_SRCS
+     abstractconnectioncontroller.cpp
+     abstractrfbserver.cpp
+     connectiondialog.cpp
+     events.cpp
+     framebuffermanager.cpp
+     invitation.cpp
+     invitedialog.cpp
+     invitationmanager.cpp
+     krfbconnectioncontroller.cpp
+     krfbserver.cpp
+     main.cpp
+     manageinvitationsdialog.cpp
+     personalinvitedialog.cpp
+     servermanager.cpp
+     sockethelpers.cpp
+     trayicon.cpp
+)
+
+kde4_add_kcfg_files (krfb_SRCS
+                     krfbconfig.kcfgc
+)
+
+kde4_add_ui_files (krfb_SRCS
+                   ui/configtcp.ui
+                   ui/configsecurity.ui
+                   ui/connectionwidget.ui
+                   ui/invitewidget.ui
+                   ui/manageinvitations.ui
+                   ui/personalinvitewidget.ui
+)
+
+kde4_add_executable (krfb
+                     ${krfb_SRCS}
+)
+
+target_link_libraries (krfb
+                       krfbprivate
+                       ${JPEG_LIBRARIES}
+                       ${LIBVNCSERVER_LIBRARIES}
+                       ${X11_Xext_LIB}
+                       ${X11_X11_LIB}
+                       ${X11_Xdamage_LIB}
+                       ${QT_QTNETWORK_LIBRARY}
+                       ${KDE4_KDNSSD_LIBS}
+                       ${KDE4_KDEUI_LIBS}
+)
+
+if (X11_XTest_FOUND)
+    target_link_libraries (krfb
+                           ${X11_XTest_LIB}
+    )
+endif (X11_XTest_FOUND)
+
+install (TARGETS krfb
+         ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+########### install files ###############
+
+install (PROGRAMS krfb.desktop
+         DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install (FILES krfb.notifyrc
+         DESTINATION ${DATA_INSTALL_DIR}/krfb
+)
+ 
diff --git a/Messages.sh b/krfb/Messages.sh
similarity index 56%
rename from Messages.sh
rename to krfb/Messages.sh
index 8cdee072..ce9a4562 100644
--- a/Messages.sh
+++ b/krfb/Messages.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
-$EXTRACTRC *.ui *.kcfg >> rc.cpp
+$EXTRACTRC ui/*.ui *.kcfg >> rc.cpp
 $XGETTEXT *.cpp -o $podir/krfb.pot
diff --git a/abstractconnectioncontroller.cpp b/krfb/abstractconnectioncontroller.cpp
similarity index 100%
rename from abstractconnectioncontroller.cpp
rename to krfb/abstractconnectioncontroller.cpp
diff --git a/abstractconnectioncontroller.h b/krfb/abstractconnectioncontroller.h
similarity index 100%
rename from abstractconnectioncontroller.h
rename to krfb/abstractconnectioncontroller.h
diff --git a/abstractrfbserver.cpp b/krfb/abstractrfbserver.cpp
similarity index 100%
rename from abstractrfbserver.cpp
rename to krfb/abstractrfbserver.cpp
diff --git a/abstractrfbserver.h b/krfb/abstractrfbserver.h
similarity index 100%
rename from abstractrfbserver.h
rename to krfb/abstractrfbserver.h
diff --git a/config-krfb.h.cmake b/krfb/config-krfb.h.cmake
similarity index 100%
rename from config-krfb.h.cmake
rename to krfb/config-krfb.h.cmake
diff --git a/connectiondialog.cpp b/krfb/connectiondialog.cpp
similarity index 100%
rename from connectiondialog.cpp
rename to krfb/connectiondialog.cpp
diff --git a/connectiondialog.h b/krfb/connectiondialog.h
similarity index 100%
rename from connectiondialog.h
rename to krfb/connectiondialog.h
diff --git a/events.cpp b/krfb/events.cpp
similarity index 100%
rename from events.cpp
rename to krfb/events.cpp
diff --git a/events.h b/krfb/events.h
similarity index 100%
rename from events.h
rename to krfb/events.h
diff --git a/framebuffer.cpp b/krfb/framebuffer.cpp
similarity index 100%
rename from framebuffer.cpp
rename to krfb/framebuffer.cpp
diff --git a/framebuffer.h b/krfb/framebuffer.h
similarity index 100%
rename from framebuffer.h
rename to krfb/framebuffer.h
diff --git a/framebuffermanager.cpp b/krfb/framebuffermanager.cpp
similarity index 100%
rename from framebuffermanager.cpp
rename to krfb/framebuffermanager.cpp
diff --git a/framebuffermanager.h b/krfb/framebuffermanager.h
similarity index 100%
rename from framebuffermanager.h
rename to krfb/framebuffermanager.h
diff --git a/framebufferplugin.cpp b/krfb/framebufferplugin.cpp
similarity index 100%
rename from framebufferplugin.cpp
rename to krfb/framebufferplugin.cpp
diff --git a/framebufferplugin.h b/krfb/framebufferplugin.h
similarity index 100%
rename from framebufferplugin.h
rename to krfb/framebufferplugin.h
diff --git a/invitation.cpp b/krfb/invitation.cpp
similarity index 100%
rename from invitation.cpp
rename to krfb/invitation.cpp
diff --git a/invitation.h b/krfb/invitation.h
similarity index 100%
rename from invitation.h
rename to krfb/invitation.h
diff --git a/invitationmanager.cpp b/krfb/invitationmanager.cpp
similarity index 100%
rename from invitationmanager.cpp
rename to krfb/invitationmanager.cpp
diff --git a/invitationmanager.h b/krfb/invitationmanager.h
similarity index 100%
rename from invitationmanager.h
rename to krfb/invitationmanager.h
diff --git a/invitedialog.cpp b/krfb/invitedialog.cpp
similarity index 100%
rename from invitedialog.cpp
rename to krfb/invitedialog.cpp
diff --git a/invitedialog.h b/krfb/invitedialog.h
similarity index 100%
rename from invitedialog.h
rename to krfb/invitedialog.h
diff --git a/krfb-framebuffer.desktop b/krfb/krfb-framebuffer.desktop
similarity index 100%
rename from krfb-framebuffer.desktop
rename to krfb/krfb-framebuffer.desktop
diff --git a/krfb.desktop b/krfb/krfb.desktop
similarity index 100%
rename from krfb.desktop
rename to krfb/krfb.desktop
diff --git a/krfb.kcfg b/krfb/krfb.kcfg
similarity index 100%
rename from krfb.kcfg
rename to krfb/krfb.kcfg
diff --git a/krfb.notifyrc b/krfb/krfb.notifyrc
similarity index 100%
rename from krfb.notifyrc
rename to krfb/krfb.notifyrc
diff --git a/krfbconfig.kcfgc b/krfb/krfbconfig.kcfgc
similarity index 100%
rename from krfbconfig.kcfgc
rename to krfb/krfbconfig.kcfgc
diff --git a/krfbconnectioncontroller.cpp b/krfb/krfbconnectioncontroller.cpp
similarity index 100%
rename from krfbconnectioncontroller.cpp
rename to krfb/krfbconnectioncontroller.cpp
diff --git a/krfbconnectioncontroller.h b/krfb/krfbconnectioncontroller.h
similarity index 100%
rename from krfbconnectioncontroller.h
rename to krfb/krfbconnectioncontroller.h
diff --git a/krfbserver.cpp b/krfb/krfbserver.cpp
similarity index 100%
rename from krfbserver.cpp
rename to krfb/krfbserver.cpp
diff --git a/krfbserver.h b/krfb/krfbserver.h
similarity index 100%
rename from krfbserver.h
rename to krfb/krfbserver.h
diff --git a/main.cpp b/krfb/main.cpp
similarity index 100%
rename from main.cpp
rename to krfb/main.cpp
diff --git a/manageinvitationsdialog.cpp b/krfb/manageinvitationsdialog.cpp
similarity index 100%
rename from manageinvitationsdialog.cpp
rename to krfb/manageinvitationsdialog.cpp
diff --git a/manageinvitationsdialog.h b/krfb/manageinvitationsdialog.h
similarity index 100%
rename from manageinvitationsdialog.h
rename to krfb/manageinvitationsdialog.h
diff --git a/personalinvitedialog.cpp b/krfb/personalinvitedialog.cpp
similarity index 100%
rename from personalinvitedialog.cpp
rename to krfb/personalinvitedialog.cpp
diff --git a/personalinvitedialog.h b/krfb/personalinvitedialog.h
similarity index 100%
rename from personalinvitedialog.h
rename to krfb/personalinvitedialog.h
diff --git a/rfb.h b/krfb/rfb.h
similarity index 100%
rename from rfb.h
rename to krfb/rfb.h
diff --git a/servermanager.cpp b/krfb/servermanager.cpp
similarity index 100%
rename from servermanager.cpp
rename to krfb/servermanager.cpp
diff --git a/servermanager.h b/krfb/servermanager.h
similarity index 100%
rename from servermanager.h
rename to krfb/servermanager.h
diff --git a/sockethelpers.cpp b/krfb/sockethelpers.cpp
similarity index 100%
rename from sockethelpers.cpp
rename to krfb/sockethelpers.cpp
diff --git a/sockethelpers.h b/krfb/sockethelpers.h
similarity index 100%
rename from sockethelpers.h
rename to krfb/sockethelpers.h
diff --git a/trayicon.cpp b/krfb/trayicon.cpp
similarity index 100%
rename from trayicon.cpp
rename to krfb/trayicon.cpp
diff --git a/trayicon.h b/krfb/trayicon.h
similarity index 100%
rename from trayicon.h
rename to krfb/trayicon.h
diff --git a/configsecurity.ui b/krfb/ui/configsecurity.ui
similarity index 100%
rename from configsecurity.ui
rename to krfb/ui/configsecurity.ui
diff --git a/configtcp.ui b/krfb/ui/configtcp.ui
similarity index 100%
rename from configtcp.ui
rename to krfb/ui/configtcp.ui
diff --git a/connectionwidget.ui b/krfb/ui/connectionwidget.ui
similarity index 100%
rename from connectionwidget.ui
rename to krfb/ui/connectionwidget.ui
diff --git a/invitewidget.ui b/krfb/ui/invitewidget.ui
similarity index 100%
rename from invitewidget.ui
rename to krfb/ui/invitewidget.ui
diff --git a/manageinvitations.ui b/krfb/ui/manageinvitations.ui
similarity index 100%
rename from manageinvitations.ui
rename to krfb/ui/manageinvitations.ui
diff --git a/personalinvitewidget.ui b/krfb/ui/personalinvitewidget.ui
similarity index 100%
rename from personalinvitewidget.ui
rename to krfb/ui/personalinvitewidget.ui