diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81aa906..e68a98d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,16 +11,19 @@ if (PKG_CONFIG_FOUND)
   include_directories(${PJSIP_INCLUDE_DIRS})
 endif()
 
+include_directories(src/telephony)
+include_directories(src/gui)
+
 set(ktelephone_SRC
   src/main.cpp
-  src/ktelephonemanager.cpp
-  src/ktelephoneguide.cpp
-  src/ktelephone.cpp
-  src/ktelephonepreferences.cpp
-  src/mycall.cpp
-  src/ua.cpp
-  src/uamanager.cpp
-  src/ktelephonecall.cpp
+  src/gui/ktelephonemanager.cpp
+  src/gui/ktelephoneguide.cpp
+  src/gui/ktelephone.cpp
+  src/gui/ktelephonepreferences.cpp
+  src/gui/ktelephonecall.cpp
+  src/telephony/mycall.cpp
+  src/telephony/ua.cpp
+  src/telephony/uamanager.cpp
 )
 
 qt5_wrap_ui(ktelephone_SRC src/ui/ktelephone.ui src/ui/startguide.ui src/ui/settings.ui src/ui/call.ui)
diff --git a/src/ktelephone.cpp b/src/gui/ktelephone.cpp
similarity index 100%
rename from src/ktelephone.cpp
rename to src/gui/ktelephone.cpp
diff --git a/src/ktelephone.h b/src/gui/ktelephone.h
similarity index 100%
rename from src/ktelephone.h
rename to src/gui/ktelephone.h
diff --git a/src/ktelephonecall.cpp b/src/gui/ktelephonecall.cpp
similarity index 100%
rename from src/ktelephonecall.cpp
rename to src/gui/ktelephonecall.cpp
diff --git a/src/ktelephonecall.h b/src/gui/ktelephonecall.h
similarity index 100%
rename from src/ktelephonecall.h
rename to src/gui/ktelephonecall.h
diff --git a/src/ktelephoneguide.cpp b/src/gui/ktelephoneguide.cpp
similarity index 100%
rename from src/ktelephoneguide.cpp
rename to src/gui/ktelephoneguide.cpp
diff --git a/src/ktelephoneguide.h b/src/gui/ktelephoneguide.h
similarity index 100%
rename from src/ktelephoneguide.h
rename to src/gui/ktelephoneguide.h
diff --git a/src/ktelephonehelp.cpp b/src/gui/ktelephonehelp.cpp
similarity index 100%
rename from src/ktelephonehelp.cpp
rename to src/gui/ktelephonehelp.cpp
diff --git a/src/ktelephonehelp.h b/src/gui/ktelephonehelp.h
similarity index 100%
rename from src/ktelephonehelp.h
rename to src/gui/ktelephonehelp.h
diff --git a/src/ktelephonemanager.cpp b/src/gui/ktelephonemanager.cpp
similarity index 100%
rename from src/ktelephonemanager.cpp
rename to src/gui/ktelephonemanager.cpp
diff --git a/src/ktelephonemanager.h b/src/gui/ktelephonemanager.h
similarity index 100%
rename from src/ktelephonemanager.h
rename to src/gui/ktelephonemanager.h
diff --git a/src/ktelephonepreferences.cpp b/src/gui/ktelephonepreferences.cpp
similarity index 100%
rename from src/ktelephonepreferences.cpp
rename to src/gui/ktelephonepreferences.cpp
diff --git a/src/ktelephonepreferences.h b/src/gui/ktelephonepreferences.h
similarity index 100%
rename from src/ktelephonepreferences.h
rename to src/gui/ktelephonepreferences.h
diff --git a/src/mycall.cpp b/src/telephony/mycall.cpp
similarity index 100%
rename from src/mycall.cpp
rename to src/telephony/mycall.cpp
diff --git a/src/mycall.h b/src/telephony/mycall.h
similarity index 100%
rename from src/mycall.h
rename to src/telephony/mycall.h
diff --git a/src/ua.cpp b/src/telephony/ua.cpp
similarity index 100%
rename from src/ua.cpp
rename to src/telephony/ua.cpp
diff --git a/src/ua.h b/src/telephony/ua.h
similarity index 100%
rename from src/ua.h
rename to src/telephony/ua.h
diff --git a/src/uamanager.cpp b/src/telephony/uamanager.cpp
similarity index 100%
rename from src/uamanager.cpp
rename to src/telephony/uamanager.cpp
diff --git a/src/uamanager.h b/src/telephony/uamanager.h
similarity index 100%
rename from src/uamanager.h
rename to src/telephony/uamanager.h