diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro
index b2217c5..67708c5 100644
--- a/kiwix-desktop.pro
+++ b/kiwix-desktop.pro
@@ -30,31 +30,31 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 
 SOURCES += \
-        main.cpp \
-        mainwindow.cpp \
-    kiwixschemehandler.cpp \
-    kiwixapp.cpp \
-    blobbuffer.cpp \
-    kiwixrequestinterceptor.cpp \
-    kiwixwebview.cpp \
-    library.cpp \
-    topwidget.cpp \
-    ktabwidget.cpp
+    src/main.cpp \
+    src/mainwindow.cpp \
+    src/kiwixschemehandler.cpp \
+    src/kiwixapp.cpp \
+    src/blobbuffer.cpp \
+    src/kiwixrequestinterceptor.cpp \
+    src/kiwixwebview.cpp \
+    src/library.cpp \
+    src/topwidget.cpp \
+    src/ktabwidget.cpp
 
 HEADERS += \
-        mainwindow.h \
-    kiwixschemehandler.h \
-    kiwixapp.h \
-    blobbuffer.h \
-    kiwixrequestinterceptor.h \
-    kiwixwebview.h \
-    library.h \
-    topwidget.h \
-    ktabwidget.h \
-    kconstants.h
+    src/mainwindow.h \
+    src/kiwixschemehandler.h \
+    src/kiwixapp.h \
+    src/blobbuffer.h \
+    src/kiwixrequestinterceptor.h \
+    src/kiwixwebview.h \
+    src/library.h \
+    src/topwidget.h \
+    src/ktabwidget.h \
+    src/kconstants.h
 
 FORMS += \
-        mainwindow.ui
+    ui/mainwindow.ui
 
 isEmpty(PREFIX) {
  PREFIX = /usr/local
diff --git a/blobbuffer.cpp b/src/blobbuffer.cpp
similarity index 100%
rename from blobbuffer.cpp
rename to src/blobbuffer.cpp
diff --git a/blobbuffer.h b/src/blobbuffer.h
similarity index 100%
rename from blobbuffer.h
rename to src/blobbuffer.h
diff --git a/kconstants.h b/src/kconstants.h
similarity index 100%
rename from kconstants.h
rename to src/kconstants.h
diff --git a/kiwixapp.cpp b/src/kiwixapp.cpp
similarity index 100%
rename from kiwixapp.cpp
rename to src/kiwixapp.cpp
diff --git a/kiwixapp.h b/src/kiwixapp.h
similarity index 100%
rename from kiwixapp.h
rename to src/kiwixapp.h
diff --git a/kiwixrequestinterceptor.cpp b/src/kiwixrequestinterceptor.cpp
similarity index 100%
rename from kiwixrequestinterceptor.cpp
rename to src/kiwixrequestinterceptor.cpp
diff --git a/kiwixrequestinterceptor.h b/src/kiwixrequestinterceptor.h
similarity index 100%
rename from kiwixrequestinterceptor.h
rename to src/kiwixrequestinterceptor.h
diff --git a/kiwixschemehandler.cpp b/src/kiwixschemehandler.cpp
similarity index 100%
rename from kiwixschemehandler.cpp
rename to src/kiwixschemehandler.cpp
diff --git a/kiwixschemehandler.h b/src/kiwixschemehandler.h
similarity index 100%
rename from kiwixschemehandler.h
rename to src/kiwixschemehandler.h
diff --git a/kiwixwebview.cpp b/src/kiwixwebview.cpp
similarity index 100%
rename from kiwixwebview.cpp
rename to src/kiwixwebview.cpp
diff --git a/kiwixwebview.h b/src/kiwixwebview.h
similarity index 100%
rename from kiwixwebview.h
rename to src/kiwixwebview.h
diff --git a/ktabwidget.cpp b/src/ktabwidget.cpp
similarity index 100%
rename from ktabwidget.cpp
rename to src/ktabwidget.cpp
diff --git a/ktabwidget.h b/src/ktabwidget.h
similarity index 100%
rename from ktabwidget.h
rename to src/ktabwidget.h
diff --git a/library.cpp b/src/library.cpp
similarity index 100%
rename from library.cpp
rename to src/library.cpp
diff --git a/library.h b/src/library.h
similarity index 100%
rename from library.h
rename to src/library.h
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/mainwindow.cpp b/src/mainwindow.cpp
similarity index 100%
rename from mainwindow.cpp
rename to src/mainwindow.cpp
diff --git a/mainwindow.h b/src/mainwindow.h
similarity index 100%
rename from mainwindow.h
rename to src/mainwindow.h
diff --git a/topwidget.cpp b/src/topwidget.cpp
similarity index 100%
rename from topwidget.cpp
rename to src/topwidget.cpp
diff --git a/topwidget.h b/src/topwidget.h
similarity index 100%
rename from topwidget.h
rename to src/topwidget.h
diff --git a/mainwindow.ui b/ui/mainwindow.ui
similarity index 95%
rename from mainwindow.ui
rename to ui/mainwindow.ui
index 58d3fdf..0681395 100644
--- a/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -48,12 +48,12 @@
   <customwidget>
    <class>TopWidget</class>
    <extends>QToolBar</extends>
-   <header>topwidget.h</header>
+   <header>src/topwidget.h</header>
   </customwidget>
   <customwidget>
    <class>KTabWidget</class>
    <extends>QTabWidget</extends>
-   <header>ktabwidget.h</header>
+   <header>src/ktabwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>