diff --git a/src/gui/main/gui.pro b/src/gui/gui.pro
similarity index 94%
rename from src/gui/main/gui.pro
rename to src/gui/gui.pro
index 23781f59..077e79b3 100644
--- a/src/gui/main/gui.pro
+++ b/src/gui/gui.pro
@@ -95,7 +95,7 @@ HEADERS += src/MainWindow.h \
     src/LoginResult.h
 RESOURCES += res/Synergy.qrc
 RC_FILE = res/win/Synergy.rc
-macx {
+macx { 
     HEADERS += src/AXDatabaseCleaner.h
     OBJECTIVE_SOURCES += src/AXDatabaseCleaner.mm
     QMAKE_INFO_PLIST = res/mac/Info.plist
@@ -106,21 +106,21 @@ macx {
     LIBS += $$MACX_LIBS
 }
 unix:!macx:LIBS += -ldns_sd
-win32 {
-    Debug:DESTDIR = ../../../bin/Debug
-    Release:DESTDIR = ../../../bin/Release
-    LIBS += -L"../../../ext/bonjour/x64" \
-        -ldnssd
-    INCLUDEPATH += "$(BONJOUR_SDK_HOME)/Include"
-}
-else:DESTDIR = ../../../bin
-debug {
+debug { 
     OBJECTS_DIR = tmp/debug
     MOC_DIR = tmp/debug
     RCC_DIR = tmp/debug
 }
-release {
+release { 
     OBJECTS_DIR = tmp/release
     MOC_DIR = tmp/release
     RCC_DIR = tmp/release
 }
+win32 { 
+    Debug:DESTDIR = ../../bin/Debug
+    Release:DESTDIR = ../../bin/Release
+    LIBS += -L"../../ext/bonjour/x64" \
+        -ldnssd
+    INCLUDEPATH += "$(BONJOUR_SDK_HOME)/Include"
+}
+else:DESTDIR = ../../bin
diff --git a/src/gui/main/gui.ts b/src/gui/gui.ts
similarity index 100%
rename from src/gui/main/gui.ts
rename to src/gui/gui.ts
diff --git a/src/gui/main/lang.cmd b/src/gui/lang.cmd
similarity index 100%
rename from src/gui/main/lang.cmd
rename to src/gui/lang.cmd
diff --git a/src/gui/main/langbuild.cmd b/src/gui/langbuild.cmd
similarity index 100%
rename from src/gui/main/langbuild.cmd
rename to src/gui/langbuild.cmd
diff --git a/src/gui/main/res/AboutDialogBase.ui b/src/gui/res/AboutDialogBase.ui
similarity index 100%
rename from src/gui/main/res/AboutDialogBase.ui
rename to src/gui/res/AboutDialogBase.ui
diff --git a/src/gui/main/res/ActionDialogBase.ui b/src/gui/res/ActionDialogBase.ui
similarity index 100%
rename from src/gui/main/res/ActionDialogBase.ui
rename to src/gui/res/ActionDialogBase.ui
diff --git a/src/gui/main/res/AddClientDialogBase.ui b/src/gui/res/AddClientDialogBase.ui
similarity index 100%
rename from src/gui/main/res/AddClientDialogBase.ui
rename to src/gui/res/AddClientDialogBase.ui
diff --git a/src/gui/main/res/HotkeyDialogBase.ui b/src/gui/res/HotkeyDialogBase.ui
similarity index 100%
rename from src/gui/main/res/HotkeyDialogBase.ui
rename to src/gui/res/HotkeyDialogBase.ui
diff --git a/src/gui/main/res/LoginWindow.h b/src/gui/res/LoginWindow.h
similarity index 100%
rename from src/gui/main/res/LoginWindow.h
rename to src/gui/res/LoginWindow.h
diff --git a/src/gui/main/res/LoginWindowBase.ui b/src/gui/res/LoginWindowBase.ui
similarity index 100%
rename from src/gui/main/res/LoginWindowBase.ui
rename to src/gui/res/LoginWindowBase.ui
diff --git a/src/gui/main/res/MainWindowBase.ui b/src/gui/res/MainWindowBase.ui
similarity index 100%
rename from src/gui/main/res/MainWindowBase.ui
rename to src/gui/res/MainWindowBase.ui
diff --git a/src/gui/main/res/ScreenSettingsDialogBase.ui b/src/gui/res/ScreenSettingsDialogBase.ui
similarity index 100%
rename from src/gui/main/res/ScreenSettingsDialogBase.ui
rename to src/gui/res/ScreenSettingsDialogBase.ui
diff --git a/src/gui/main/res/ServerConfigDialogBase.ui b/src/gui/res/ServerConfigDialogBase.ui
similarity index 100%
rename from src/gui/main/res/ServerConfigDialogBase.ui
rename to src/gui/res/ServerConfigDialogBase.ui
diff --git a/src/gui/main/res/SettingsDialogBase.ui b/src/gui/res/SettingsDialogBase.ui
similarity index 100%
rename from src/gui/main/res/SettingsDialogBase.ui
rename to src/gui/res/SettingsDialogBase.ui
diff --git a/src/gui/main/res/SetupWizardBase.ui b/src/gui/res/SetupWizardBase.ui
similarity index 100%
rename from src/gui/main/res/SetupWizardBase.ui
rename to src/gui/res/SetupWizardBase.ui
diff --git a/src/gui/main/res/Synergy.qrc b/src/gui/res/Synergy.qrc
similarity index 100%
rename from src/gui/main/res/Synergy.qrc
rename to src/gui/res/Synergy.qrc
diff --git a/src/gui/main/res/icons/16x16/money.png b/src/gui/res/icons/16x16/money.png
similarity index 100%
rename from src/gui/main/res/icons/16x16/money.png
rename to src/gui/res/icons/16x16/money.png
diff --git a/src/gui/main/res/icons/16x16/synergy-connected.png b/src/gui/res/icons/16x16/synergy-connected.png
similarity index 100%
rename from src/gui/main/res/icons/16x16/synergy-connected.png
rename to src/gui/res/icons/16x16/synergy-connected.png
diff --git a/src/gui/main/res/icons/16x16/synergy-connected.psd b/src/gui/res/icons/16x16/synergy-connected.psd
similarity index 100%
rename from src/gui/main/res/icons/16x16/synergy-connected.psd
rename to src/gui/res/icons/16x16/synergy-connected.psd
diff --git a/src/gui/main/res/icons/16x16/synergy-disconnected.png b/src/gui/res/icons/16x16/synergy-disconnected.png
similarity index 100%
rename from src/gui/main/res/icons/16x16/synergy-disconnected.png
rename to src/gui/res/icons/16x16/synergy-disconnected.png
diff --git a/src/gui/main/res/icons/16x16/synergy-disconnected.psd b/src/gui/res/icons/16x16/synergy-disconnected.psd
similarity index 100%
rename from src/gui/main/res/icons/16x16/synergy-disconnected.psd
rename to src/gui/res/icons/16x16/synergy-disconnected.psd
diff --git a/src/gui/main/res/icons/16x16/warning.png b/src/gui/res/icons/16x16/warning.png
similarity index 100%
rename from src/gui/main/res/icons/16x16/warning.png
rename to src/gui/res/icons/16x16/warning.png
diff --git a/src/gui/main/res/icons/256x256/synergy.ico b/src/gui/res/icons/256x256/synergy.ico
similarity index 100%
rename from src/gui/main/res/icons/256x256/synergy.ico
rename to src/gui/res/icons/256x256/synergy.ico
diff --git a/src/gui/main/res/icons/64x64/user-trash.png b/src/gui/res/icons/64x64/user-trash.png
similarity index 100%
rename from src/gui/main/res/icons/64x64/user-trash.png
rename to src/gui/res/icons/64x64/user-trash.png
diff --git a/src/gui/main/res/icons/64x64/video-display.png b/src/gui/res/icons/64x64/video-display.png
similarity index 100%
rename from src/gui/main/res/icons/64x64/video-display.png
rename to src/gui/res/icons/64x64/video-display.png
diff --git a/src/gui/main/res/image/about.png b/src/gui/res/image/about.png
similarity index 100%
rename from src/gui/main/res/image/about.png
rename to src/gui/res/image/about.png
diff --git a/src/gui/main/res/lang/Languages.xml b/src/gui/res/lang/Languages.xml
similarity index 100%
rename from src/gui/main/res/lang/Languages.xml
rename to src/gui/res/lang/Languages.xml
diff --git a/src/gui/main/res/lang/gui_ar.qm b/src/gui/res/lang/gui_ar.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_ar.qm
rename to src/gui/res/lang/gui_ar.qm
diff --git a/src/gui/main/res/lang/gui_ar.ts b/src/gui/res/lang/gui_ar.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_ar.ts
rename to src/gui/res/lang/gui_ar.ts
diff --git a/src/gui/main/res/lang/gui_bg-BG.qm b/src/gui/res/lang/gui_bg-BG.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_bg-BG.qm
rename to src/gui/res/lang/gui_bg-BG.qm
diff --git a/src/gui/main/res/lang/gui_bg-BG.ts b/src/gui/res/lang/gui_bg-BG.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_bg-BG.ts
rename to src/gui/res/lang/gui_bg-BG.ts
diff --git a/src/gui/main/res/lang/gui_ca-AD.qm b/src/gui/res/lang/gui_ca-AD.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_ca-AD.qm
rename to src/gui/res/lang/gui_ca-AD.qm
diff --git a/src/gui/main/res/lang/gui_ca-AD.ts b/src/gui/res/lang/gui_ca-AD.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_ca-AD.ts
rename to src/gui/res/lang/gui_ca-AD.ts
diff --git a/src/gui/main/res/lang/gui_cs-CZ.qm b/src/gui/res/lang/gui_cs-CZ.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_cs-CZ.qm
rename to src/gui/res/lang/gui_cs-CZ.qm
diff --git a/src/gui/main/res/lang/gui_cs-CZ.ts b/src/gui/res/lang/gui_cs-CZ.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_cs-CZ.ts
rename to src/gui/res/lang/gui_cs-CZ.ts
diff --git a/src/gui/main/res/lang/gui_cy.qm b/src/gui/res/lang/gui_cy.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_cy.qm
rename to src/gui/res/lang/gui_cy.qm
diff --git a/src/gui/main/res/lang/gui_cy.ts b/src/gui/res/lang/gui_cy.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_cy.ts
rename to src/gui/res/lang/gui_cy.ts
diff --git a/src/gui/main/res/lang/gui_da.qm b/src/gui/res/lang/gui_da.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_da.qm
rename to src/gui/res/lang/gui_da.qm
diff --git a/src/gui/main/res/lang/gui_da.ts b/src/gui/res/lang/gui_da.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_da.ts
rename to src/gui/res/lang/gui_da.ts
diff --git a/src/gui/main/res/lang/gui_de.qm b/src/gui/res/lang/gui_de.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_de.qm
rename to src/gui/res/lang/gui_de.qm
diff --git a/src/gui/main/res/lang/gui_de.ts b/src/gui/res/lang/gui_de.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_de.ts
rename to src/gui/res/lang/gui_de.ts
diff --git a/src/gui/main/res/lang/gui_es.qm b/src/gui/res/lang/gui_es.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_es.qm
rename to src/gui/res/lang/gui_es.qm
diff --git a/src/gui/main/res/lang/gui_es.ts b/src/gui/res/lang/gui_es.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_es.ts
rename to src/gui/res/lang/gui_es.ts
diff --git a/src/gui/main/res/lang/gui_fi.qm b/src/gui/res/lang/gui_fi.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_fi.qm
rename to src/gui/res/lang/gui_fi.qm
diff --git a/src/gui/main/res/lang/gui_fi.ts b/src/gui/res/lang/gui_fi.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_fi.ts
rename to src/gui/res/lang/gui_fi.ts
diff --git a/src/gui/main/res/lang/gui_fr.qm b/src/gui/res/lang/gui_fr.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_fr.qm
rename to src/gui/res/lang/gui_fr.qm
diff --git a/src/gui/main/res/lang/gui_fr.ts b/src/gui/res/lang/gui_fr.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_fr.ts
rename to src/gui/res/lang/gui_fr.ts
diff --git a/src/gui/main/res/lang/gui_grk.qm b/src/gui/res/lang/gui_grk.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_grk.qm
rename to src/gui/res/lang/gui_grk.qm
diff --git a/src/gui/main/res/lang/gui_grk.ts b/src/gui/res/lang/gui_grk.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_grk.ts
rename to src/gui/res/lang/gui_grk.ts
diff --git a/src/gui/main/res/lang/gui_he.qm b/src/gui/res/lang/gui_he.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_he.qm
rename to src/gui/res/lang/gui_he.qm
diff --git a/src/gui/main/res/lang/gui_he.ts b/src/gui/res/lang/gui_he.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_he.ts
rename to src/gui/res/lang/gui_he.ts
diff --git a/src/gui/main/res/lang/gui_hr-HR.qm b/src/gui/res/lang/gui_hr-HR.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_hr-HR.qm
rename to src/gui/res/lang/gui_hr-HR.qm
diff --git a/src/gui/main/res/lang/gui_hr-HR.ts b/src/gui/res/lang/gui_hr-HR.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_hr-HR.ts
rename to src/gui/res/lang/gui_hr-HR.ts
diff --git a/src/gui/main/res/lang/gui_hu-HU.qm b/src/gui/res/lang/gui_hu-HU.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_hu-HU.qm
rename to src/gui/res/lang/gui_hu-HU.qm
diff --git a/src/gui/main/res/lang/gui_hu-HU.ts b/src/gui/res/lang/gui_hu-HU.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_hu-HU.ts
rename to src/gui/res/lang/gui_hu-HU.ts
diff --git a/src/gui/main/res/lang/gui_id.qm b/src/gui/res/lang/gui_id.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_id.qm
rename to src/gui/res/lang/gui_id.qm
diff --git a/src/gui/main/res/lang/gui_id.ts b/src/gui/res/lang/gui_id.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_id.ts
rename to src/gui/res/lang/gui_id.ts
diff --git a/src/gui/main/res/lang/gui_it.qm b/src/gui/res/lang/gui_it.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_it.qm
rename to src/gui/res/lang/gui_it.qm
diff --git a/src/gui/main/res/lang/gui_it.ts b/src/gui/res/lang/gui_it.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_it.ts
rename to src/gui/res/lang/gui_it.ts
diff --git a/src/gui/main/res/lang/gui_ja-JP.qm b/src/gui/res/lang/gui_ja-JP.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_ja-JP.qm
rename to src/gui/res/lang/gui_ja-JP.qm
diff --git a/src/gui/main/res/lang/gui_ja-JP.ts b/src/gui/res/lang/gui_ja-JP.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_ja-JP.ts
rename to src/gui/res/lang/gui_ja-JP.ts
diff --git a/src/gui/main/res/lang/gui_ko.qm b/src/gui/res/lang/gui_ko.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_ko.qm
rename to src/gui/res/lang/gui_ko.qm
diff --git a/src/gui/main/res/lang/gui_ko.ts b/src/gui/res/lang/gui_ko.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_ko.ts
rename to src/gui/res/lang/gui_ko.ts
diff --git a/src/gui/main/res/lang/gui_lt.qm b/src/gui/res/lang/gui_lt.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_lt.qm
rename to src/gui/res/lang/gui_lt.qm
diff --git a/src/gui/main/res/lang/gui_lt.ts b/src/gui/res/lang/gui_lt.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_lt.ts
rename to src/gui/res/lang/gui_lt.ts
diff --git a/src/gui/main/res/lang/gui_lv.qm b/src/gui/res/lang/gui_lv.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_lv.qm
rename to src/gui/res/lang/gui_lv.qm
diff --git a/src/gui/main/res/lang/gui_lv.ts b/src/gui/res/lang/gui_lv.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_lv.ts
rename to src/gui/res/lang/gui_lv.ts
diff --git a/src/gui/main/res/lang/gui_mr.qm b/src/gui/res/lang/gui_mr.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_mr.qm
rename to src/gui/res/lang/gui_mr.qm
diff --git a/src/gui/main/res/lang/gui_mr.ts b/src/gui/res/lang/gui_mr.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_mr.ts
rename to src/gui/res/lang/gui_mr.ts
diff --git a/src/gui/main/res/lang/gui_nl-NL.qm b/src/gui/res/lang/gui_nl-NL.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_nl-NL.qm
rename to src/gui/res/lang/gui_nl-NL.qm
diff --git a/src/gui/main/res/lang/gui_nl-NL.ts b/src/gui/res/lang/gui_nl-NL.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_nl-NL.ts
rename to src/gui/res/lang/gui_nl-NL.ts
diff --git a/src/gui/main/res/lang/gui_no.qm b/src/gui/res/lang/gui_no.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_no.qm
rename to src/gui/res/lang/gui_no.qm
diff --git a/src/gui/main/res/lang/gui_no.ts b/src/gui/res/lang/gui_no.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_no.ts
rename to src/gui/res/lang/gui_no.ts
diff --git a/src/gui/main/res/lang/gui_pes-IR.qm b/src/gui/res/lang/gui_pes-IR.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_pes-IR.qm
rename to src/gui/res/lang/gui_pes-IR.qm
diff --git a/src/gui/main/res/lang/gui_pes-IR.ts b/src/gui/res/lang/gui_pes-IR.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_pes-IR.ts
rename to src/gui/res/lang/gui_pes-IR.ts
diff --git a/src/gui/main/res/lang/gui_pl-PL.qm b/src/gui/res/lang/gui_pl-PL.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_pl-PL.qm
rename to src/gui/res/lang/gui_pl-PL.qm
diff --git a/src/gui/main/res/lang/gui_pl-PL.ts b/src/gui/res/lang/gui_pl-PL.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_pl-PL.ts
rename to src/gui/res/lang/gui_pl-PL.ts
diff --git a/src/gui/main/res/lang/gui_pt-BR.qm b/src/gui/res/lang/gui_pt-BR.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_pt-BR.qm
rename to src/gui/res/lang/gui_pt-BR.qm
diff --git a/src/gui/main/res/lang/gui_pt-BR.ts b/src/gui/res/lang/gui_pt-BR.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_pt-BR.ts
rename to src/gui/res/lang/gui_pt-BR.ts
diff --git a/src/gui/main/res/lang/gui_pt-PT.qm b/src/gui/res/lang/gui_pt-PT.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_pt-PT.qm
rename to src/gui/res/lang/gui_pt-PT.qm
diff --git a/src/gui/main/res/lang/gui_pt-PT.ts b/src/gui/res/lang/gui_pt-PT.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_pt-PT.ts
rename to src/gui/res/lang/gui_pt-PT.ts
diff --git a/src/gui/main/res/lang/gui_ro.qm b/src/gui/res/lang/gui_ro.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_ro.qm
rename to src/gui/res/lang/gui_ro.qm
diff --git a/src/gui/main/res/lang/gui_ro.ts b/src/gui/res/lang/gui_ro.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_ro.ts
rename to src/gui/res/lang/gui_ro.ts
diff --git a/src/gui/main/res/lang/gui_ru.qm b/src/gui/res/lang/gui_ru.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_ru.qm
rename to src/gui/res/lang/gui_ru.qm
diff --git a/src/gui/main/res/lang/gui_ru.ts b/src/gui/res/lang/gui_ru.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_ru.ts
rename to src/gui/res/lang/gui_ru.ts
diff --git a/src/gui/main/res/lang/gui_si.qm b/src/gui/res/lang/gui_si.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_si.qm
rename to src/gui/res/lang/gui_si.qm
diff --git a/src/gui/main/res/lang/gui_si.ts b/src/gui/res/lang/gui_si.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_si.ts
rename to src/gui/res/lang/gui_si.ts
diff --git a/src/gui/main/res/lang/gui_sk-SK.qm b/src/gui/res/lang/gui_sk-SK.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_sk-SK.qm
rename to src/gui/res/lang/gui_sk-SK.qm
diff --git a/src/gui/main/res/lang/gui_sk-SK.ts b/src/gui/res/lang/gui_sk-SK.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_sk-SK.ts
rename to src/gui/res/lang/gui_sk-SK.ts
diff --git a/src/gui/main/res/lang/gui_sl-SI.qm b/src/gui/res/lang/gui_sl-SI.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_sl-SI.qm
rename to src/gui/res/lang/gui_sl-SI.qm
diff --git a/src/gui/main/res/lang/gui_sl-SI.ts b/src/gui/res/lang/gui_sl-SI.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_sl-SI.ts
rename to src/gui/res/lang/gui_sl-SI.ts
diff --git a/src/gui/main/res/lang/gui_sq-AL.qm b/src/gui/res/lang/gui_sq-AL.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_sq-AL.qm
rename to src/gui/res/lang/gui_sq-AL.qm
diff --git a/src/gui/main/res/lang/gui_sq-AL.ts b/src/gui/res/lang/gui_sq-AL.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_sq-AL.ts
rename to src/gui/res/lang/gui_sq-AL.ts
diff --git a/src/gui/main/res/lang/gui_sr.qm b/src/gui/res/lang/gui_sr.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_sr.qm
rename to src/gui/res/lang/gui_sr.qm
diff --git a/src/gui/main/res/lang/gui_sr.ts b/src/gui/res/lang/gui_sr.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_sr.ts
rename to src/gui/res/lang/gui_sr.ts
diff --git a/src/gui/main/res/lang/gui_sv.qm b/src/gui/res/lang/gui_sv.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_sv.qm
rename to src/gui/res/lang/gui_sv.qm
diff --git a/src/gui/main/res/lang/gui_sv.ts b/src/gui/res/lang/gui_sv.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_sv.ts
rename to src/gui/res/lang/gui_sv.ts
diff --git a/src/gui/main/res/lang/gui_th-TH.qm b/src/gui/res/lang/gui_th-TH.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_th-TH.qm
rename to src/gui/res/lang/gui_th-TH.qm
diff --git a/src/gui/main/res/lang/gui_th-TH.ts b/src/gui/res/lang/gui_th-TH.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_th-TH.ts
rename to src/gui/res/lang/gui_th-TH.ts
diff --git a/src/gui/main/res/lang/gui_tr-TR.qm b/src/gui/res/lang/gui_tr-TR.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_tr-TR.qm
rename to src/gui/res/lang/gui_tr-TR.qm
diff --git a/src/gui/main/res/lang/gui_tr-TR.ts b/src/gui/res/lang/gui_tr-TR.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_tr-TR.ts
rename to src/gui/res/lang/gui_tr-TR.ts
diff --git a/src/gui/main/res/lang/gui_uk.qm b/src/gui/res/lang/gui_uk.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_uk.qm
rename to src/gui/res/lang/gui_uk.qm
diff --git a/src/gui/main/res/lang/gui_uk.ts b/src/gui/res/lang/gui_uk.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_uk.ts
rename to src/gui/res/lang/gui_uk.ts
diff --git a/src/gui/main/res/lang/gui_ur.qm b/src/gui/res/lang/gui_ur.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_ur.qm
rename to src/gui/res/lang/gui_ur.qm
diff --git a/src/gui/main/res/lang/gui_ur.ts b/src/gui/res/lang/gui_ur.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_ur.ts
rename to src/gui/res/lang/gui_ur.ts
diff --git a/src/gui/main/res/lang/gui_vi.qm b/src/gui/res/lang/gui_vi.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_vi.qm
rename to src/gui/res/lang/gui_vi.qm
diff --git a/src/gui/main/res/lang/gui_vi.ts b/src/gui/res/lang/gui_vi.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_vi.ts
rename to src/gui/res/lang/gui_vi.ts
diff --git a/src/gui/main/res/lang/gui_zh-CN.qm b/src/gui/res/lang/gui_zh-CN.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_zh-CN.qm
rename to src/gui/res/lang/gui_zh-CN.qm
diff --git a/src/gui/main/res/lang/gui_zh-CN.ts b/src/gui/res/lang/gui_zh-CN.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_zh-CN.ts
rename to src/gui/res/lang/gui_zh-CN.ts
diff --git a/src/gui/main/res/lang/gui_zh-TW.qm b/src/gui/res/lang/gui_zh-TW.qm
similarity index 100%
rename from src/gui/main/res/lang/gui_zh-TW.qm
rename to src/gui/res/lang/gui_zh-TW.qm
diff --git a/src/gui/main/res/lang/gui_zh-TW.ts b/src/gui/res/lang/gui_zh-TW.ts
similarity index 100%
rename from src/gui/main/res/lang/gui_zh-TW.ts
rename to src/gui/res/lang/gui_zh-TW.ts
diff --git a/src/gui/main/res/mac/Info.plist b/src/gui/res/mac/Info.plist
similarity index 100%
rename from src/gui/main/res/mac/Info.plist
rename to src/gui/res/mac/Info.plist
diff --git a/src/gui/main/res/mac/QSynergy.icns b/src/gui/res/mac/QSynergy.icns
similarity index 100%
rename from src/gui/main/res/mac/QSynergy.icns
rename to src/gui/res/mac/QSynergy.icns
diff --git a/src/gui/main/res/mac/Synergy.icns b/src/gui/res/mac/Synergy.icns
similarity index 100%
rename from src/gui/main/res/mac/Synergy.icns
rename to src/gui/res/mac/Synergy.icns
diff --git a/src/gui/main/res/win/Synergy.rc b/src/gui/res/win/Synergy.rc
similarity index 100%
rename from src/gui/main/res/win/Synergy.rc
rename to src/gui/res/win/Synergy.rc
diff --git a/src/gui/main/src/AXDatabaseCleaner.h b/src/gui/src/AXDatabaseCleaner.h
similarity index 100%
rename from src/gui/main/src/AXDatabaseCleaner.h
rename to src/gui/src/AXDatabaseCleaner.h
diff --git a/src/gui/main/src/AXDatabaseCleaner.mm b/src/gui/src/AXDatabaseCleaner.mm
similarity index 100%
rename from src/gui/main/src/AXDatabaseCleaner.mm
rename to src/gui/src/AXDatabaseCleaner.mm
diff --git a/src/gui/main/src/AboutDialog.cpp b/src/gui/src/AboutDialog.cpp
similarity index 100%
rename from src/gui/main/src/AboutDialog.cpp
rename to src/gui/src/AboutDialog.cpp
diff --git a/src/gui/main/src/AboutDialog.h b/src/gui/src/AboutDialog.h
similarity index 100%
rename from src/gui/main/src/AboutDialog.h
rename to src/gui/src/AboutDialog.h
diff --git a/src/gui/main/src/Action.cpp b/src/gui/src/Action.cpp
similarity index 100%
rename from src/gui/main/src/Action.cpp
rename to src/gui/src/Action.cpp
diff --git a/src/gui/main/src/Action.h b/src/gui/src/Action.h
similarity index 100%
rename from src/gui/main/src/Action.h
rename to src/gui/src/Action.h
diff --git a/src/gui/main/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp
similarity index 100%
rename from src/gui/main/src/ActionDialog.cpp
rename to src/gui/src/ActionDialog.cpp
diff --git a/src/gui/main/src/ActionDialog.h b/src/gui/src/ActionDialog.h
similarity index 100%
rename from src/gui/main/src/ActionDialog.h
rename to src/gui/src/ActionDialog.h
diff --git a/src/gui/main/src/AddClientDialog.cpp b/src/gui/src/AddClientDialog.cpp
similarity index 100%
rename from src/gui/main/src/AddClientDialog.cpp
rename to src/gui/src/AddClientDialog.cpp
diff --git a/src/gui/main/src/AddClientDialog.h b/src/gui/src/AddClientDialog.h
similarity index 100%
rename from src/gui/main/src/AddClientDialog.h
rename to src/gui/src/AddClientDialog.h
diff --git a/src/gui/main/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
similarity index 100%
rename from src/gui/main/src/AppConfig.cpp
rename to src/gui/src/AppConfig.cpp
diff --git a/src/gui/main/src/AppConfig.h b/src/gui/src/AppConfig.h
similarity index 100%
rename from src/gui/main/src/AppConfig.h
rename to src/gui/src/AppConfig.h
diff --git a/src/gui/main/src/BaseConfig.cpp b/src/gui/src/BaseConfig.cpp
similarity index 100%
rename from src/gui/main/src/BaseConfig.cpp
rename to src/gui/src/BaseConfig.cpp
diff --git a/src/gui/main/src/BaseConfig.h b/src/gui/src/BaseConfig.h
similarity index 100%
rename from src/gui/main/src/BaseConfig.h
rename to src/gui/src/BaseConfig.h
diff --git a/src/gui/main/src/CommandProcess.cpp b/src/gui/src/CommandProcess.cpp
similarity index 100%
rename from src/gui/main/src/CommandProcess.cpp
rename to src/gui/src/CommandProcess.cpp
diff --git a/src/gui/main/src/CommandProcess.h b/src/gui/src/CommandProcess.h
similarity index 100%
rename from src/gui/main/src/CommandProcess.h
rename to src/gui/src/CommandProcess.h
diff --git a/src/gui/main/src/DataDownloader.cpp b/src/gui/src/DataDownloader.cpp
similarity index 100%
rename from src/gui/main/src/DataDownloader.cpp
rename to src/gui/src/DataDownloader.cpp
diff --git a/src/gui/main/src/DataDownloader.h b/src/gui/src/DataDownloader.h
similarity index 100%
rename from src/gui/main/src/DataDownloader.h
rename to src/gui/src/DataDownloader.h
diff --git a/src/gui/main/src/Hotkey.cpp b/src/gui/src/Hotkey.cpp
similarity index 100%
rename from src/gui/main/src/Hotkey.cpp
rename to src/gui/src/Hotkey.cpp
diff --git a/src/gui/main/src/Hotkey.h b/src/gui/src/Hotkey.h
similarity index 100%
rename from src/gui/main/src/Hotkey.h
rename to src/gui/src/Hotkey.h
diff --git a/src/gui/main/src/HotkeyDialog.cpp b/src/gui/src/HotkeyDialog.cpp
similarity index 100%
rename from src/gui/main/src/HotkeyDialog.cpp
rename to src/gui/src/HotkeyDialog.cpp
diff --git a/src/gui/main/src/HotkeyDialog.h b/src/gui/src/HotkeyDialog.h
similarity index 100%
rename from src/gui/main/src/HotkeyDialog.h
rename to src/gui/src/HotkeyDialog.h
diff --git a/src/gui/main/src/Ipc.cpp b/src/gui/src/Ipc.cpp
similarity index 100%
rename from src/gui/main/src/Ipc.cpp
rename to src/gui/src/Ipc.cpp
diff --git a/src/gui/main/src/Ipc.h b/src/gui/src/Ipc.h
similarity index 100%
rename from src/gui/main/src/Ipc.h
rename to src/gui/src/Ipc.h
diff --git a/src/gui/main/src/IpcClient.cpp b/src/gui/src/IpcClient.cpp
similarity index 100%
rename from src/gui/main/src/IpcClient.cpp
rename to src/gui/src/IpcClient.cpp
diff --git a/src/gui/main/src/IpcClient.h b/src/gui/src/IpcClient.h
similarity index 100%
rename from src/gui/main/src/IpcClient.h
rename to src/gui/src/IpcClient.h
diff --git a/src/gui/main/src/IpcReader.cpp b/src/gui/src/IpcReader.cpp
similarity index 100%
rename from src/gui/main/src/IpcReader.cpp
rename to src/gui/src/IpcReader.cpp
diff --git a/src/gui/main/src/IpcReader.h b/src/gui/src/IpcReader.h
similarity index 100%
rename from src/gui/main/src/IpcReader.h
rename to src/gui/src/IpcReader.h
diff --git a/src/gui/main/src/KeySequence.cpp b/src/gui/src/KeySequence.cpp
similarity index 100%
rename from src/gui/main/src/KeySequence.cpp
rename to src/gui/src/KeySequence.cpp
diff --git a/src/gui/main/src/KeySequence.h b/src/gui/src/KeySequence.h
similarity index 100%
rename from src/gui/main/src/KeySequence.h
rename to src/gui/src/KeySequence.h
diff --git a/src/gui/main/src/KeySequenceWidget.cpp b/src/gui/src/KeySequenceWidget.cpp
similarity index 100%
rename from src/gui/main/src/KeySequenceWidget.cpp
rename to src/gui/src/KeySequenceWidget.cpp
diff --git a/src/gui/main/src/KeySequenceWidget.h b/src/gui/src/KeySequenceWidget.h
similarity index 100%
rename from src/gui/main/src/KeySequenceWidget.h
rename to src/gui/src/KeySequenceWidget.h
diff --git a/src/gui/main/src/LoginAuth.cpp b/src/gui/src/LoginAuth.cpp
similarity index 100%
rename from src/gui/main/src/LoginAuth.cpp
rename to src/gui/src/LoginAuth.cpp
diff --git a/src/gui/main/src/LoginAuth.h b/src/gui/src/LoginAuth.h
similarity index 100%
rename from src/gui/main/src/LoginAuth.h
rename to src/gui/src/LoginAuth.h
diff --git a/src/gui/main/src/LoginResult.h b/src/gui/src/LoginResult.h
similarity index 100%
rename from src/gui/main/src/LoginResult.h
rename to src/gui/src/LoginResult.h
diff --git a/src/gui/main/src/LoginWindow.cpp b/src/gui/src/LoginWindow.cpp
similarity index 100%
rename from src/gui/main/src/LoginWindow.cpp
rename to src/gui/src/LoginWindow.cpp
diff --git a/src/gui/main/src/LoginWindow.h b/src/gui/src/LoginWindow.h
similarity index 100%
rename from src/gui/main/src/LoginWindow.h
rename to src/gui/src/LoginWindow.h
diff --git a/src/gui/main/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
similarity index 100%
rename from src/gui/main/src/MainWindow.cpp
rename to src/gui/src/MainWindow.cpp
diff --git a/src/gui/main/src/MainWindow.h b/src/gui/src/MainWindow.h
similarity index 100%
rename from src/gui/main/src/MainWindow.h
rename to src/gui/src/MainWindow.h
diff --git a/src/gui/main/src/NewScreenWidget.cpp b/src/gui/src/NewScreenWidget.cpp
similarity index 100%
rename from src/gui/main/src/NewScreenWidget.cpp
rename to src/gui/src/NewScreenWidget.cpp
diff --git a/src/gui/main/src/NewScreenWidget.h b/src/gui/src/NewScreenWidget.h
similarity index 100%
rename from src/gui/main/src/NewScreenWidget.h
rename to src/gui/src/NewScreenWidget.h
diff --git a/src/gui/main/src/PremiumAuth.cpp b/src/gui/src/PremiumAuth.cpp
similarity index 100%
rename from src/gui/main/src/PremiumAuth.cpp
rename to src/gui/src/PremiumAuth.cpp
diff --git a/src/gui/main/src/PremiumAuth.h b/src/gui/src/PremiumAuth.h
similarity index 100%
rename from src/gui/main/src/PremiumAuth.h
rename to src/gui/src/PremiumAuth.h
diff --git a/src/gui/main/src/QSynergyApplication.cpp b/src/gui/src/QSynergyApplication.cpp
similarity index 100%
rename from src/gui/main/src/QSynergyApplication.cpp
rename to src/gui/src/QSynergyApplication.cpp
diff --git a/src/gui/main/src/QSynergyApplication.h b/src/gui/src/QSynergyApplication.h
similarity index 100%
rename from src/gui/main/src/QSynergyApplication.h
rename to src/gui/src/QSynergyApplication.h
diff --git a/src/gui/main/src/QUtility.cpp b/src/gui/src/QUtility.cpp
similarity index 100%
rename from src/gui/main/src/QUtility.cpp
rename to src/gui/src/QUtility.cpp
diff --git a/src/gui/main/src/QUtility.h b/src/gui/src/QUtility.h
similarity index 100%
rename from src/gui/main/src/QUtility.h
rename to src/gui/src/QUtility.h
diff --git a/src/gui/main/src/Screen.cpp b/src/gui/src/Screen.cpp
similarity index 100%
rename from src/gui/main/src/Screen.cpp
rename to src/gui/src/Screen.cpp
diff --git a/src/gui/main/src/Screen.h b/src/gui/src/Screen.h
similarity index 100%
rename from src/gui/main/src/Screen.h
rename to src/gui/src/Screen.h
diff --git a/src/gui/main/src/ScreenSettingsDialog.cpp b/src/gui/src/ScreenSettingsDialog.cpp
similarity index 100%
rename from src/gui/main/src/ScreenSettingsDialog.cpp
rename to src/gui/src/ScreenSettingsDialog.cpp
diff --git a/src/gui/main/src/ScreenSettingsDialog.h b/src/gui/src/ScreenSettingsDialog.h
similarity index 100%
rename from src/gui/main/src/ScreenSettingsDialog.h
rename to src/gui/src/ScreenSettingsDialog.h
diff --git a/src/gui/main/src/ScreenSetupModel.cpp b/src/gui/src/ScreenSetupModel.cpp
similarity index 100%
rename from src/gui/main/src/ScreenSetupModel.cpp
rename to src/gui/src/ScreenSetupModel.cpp
diff --git a/src/gui/main/src/ScreenSetupModel.h b/src/gui/src/ScreenSetupModel.h
similarity index 100%
rename from src/gui/main/src/ScreenSetupModel.h
rename to src/gui/src/ScreenSetupModel.h
diff --git a/src/gui/main/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp
similarity index 100%
rename from src/gui/main/src/ScreenSetupView.cpp
rename to src/gui/src/ScreenSetupView.cpp
diff --git a/src/gui/main/src/ScreenSetupView.h b/src/gui/src/ScreenSetupView.h
similarity index 100%
rename from src/gui/main/src/ScreenSetupView.h
rename to src/gui/src/ScreenSetupView.h
diff --git a/src/gui/main/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp
similarity index 100%
rename from src/gui/main/src/ServerConfig.cpp
rename to src/gui/src/ServerConfig.cpp
diff --git a/src/gui/main/src/ServerConfig.h b/src/gui/src/ServerConfig.h
similarity index 100%
rename from src/gui/main/src/ServerConfig.h
rename to src/gui/src/ServerConfig.h
diff --git a/src/gui/main/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp
similarity index 100%
rename from src/gui/main/src/ServerConfigDialog.cpp
rename to src/gui/src/ServerConfigDialog.cpp
diff --git a/src/gui/main/src/ServerConfigDialog.h b/src/gui/src/ServerConfigDialog.h
similarity index 100%
rename from src/gui/main/src/ServerConfigDialog.h
rename to src/gui/src/ServerConfigDialog.h
diff --git a/src/gui/main/src/SettingsDialog.cpp b/src/gui/src/SettingsDialog.cpp
similarity index 100%
rename from src/gui/main/src/SettingsDialog.cpp
rename to src/gui/src/SettingsDialog.cpp
diff --git a/src/gui/main/src/SettingsDialog.h b/src/gui/src/SettingsDialog.h
similarity index 100%
rename from src/gui/main/src/SettingsDialog.h
rename to src/gui/src/SettingsDialog.h
diff --git a/src/gui/main/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp
similarity index 100%
rename from src/gui/main/src/SetupWizard.cpp
rename to src/gui/src/SetupWizard.cpp
diff --git a/src/gui/main/src/SetupWizard.h b/src/gui/src/SetupWizard.h
similarity index 100%
rename from src/gui/main/src/SetupWizard.h
rename to src/gui/src/SetupWizard.h
diff --git a/src/gui/main/src/SynergyLocale.cpp b/src/gui/src/SynergyLocale.cpp
similarity index 100%
rename from src/gui/main/src/SynergyLocale.cpp
rename to src/gui/src/SynergyLocale.cpp
diff --git a/src/gui/main/src/SynergyLocale.h b/src/gui/src/SynergyLocale.h
similarity index 100%
rename from src/gui/main/src/SynergyLocale.h
rename to src/gui/src/SynergyLocale.h
diff --git a/src/gui/main/src/TcpSocketReader.cpp b/src/gui/src/TcpSocketReader.cpp
similarity index 100%
rename from src/gui/main/src/TcpSocketReader.cpp
rename to src/gui/src/TcpSocketReader.cpp
diff --git a/src/gui/main/src/TrashScreenWidget.cpp b/src/gui/src/TrashScreenWidget.cpp
similarity index 100%
rename from src/gui/main/src/TrashScreenWidget.cpp
rename to src/gui/src/TrashScreenWidget.cpp
diff --git a/src/gui/main/src/TrashScreenWidget.h b/src/gui/src/TrashScreenWidget.h
similarity index 100%
rename from src/gui/main/src/TrashScreenWidget.h
rename to src/gui/src/TrashScreenWidget.h
diff --git a/src/gui/main/src/VersionChecker.cpp b/src/gui/src/VersionChecker.cpp
similarity index 100%
rename from src/gui/main/src/VersionChecker.cpp
rename to src/gui/src/VersionChecker.cpp
diff --git a/src/gui/main/src/VersionChecker.h b/src/gui/src/VersionChecker.h
similarity index 100%
rename from src/gui/main/src/VersionChecker.h
rename to src/gui/src/VersionChecker.h
diff --git a/src/gui/main/src/ZeroconfBrowser.cpp b/src/gui/src/ZeroconfBrowser.cpp
similarity index 100%
rename from src/gui/main/src/ZeroconfBrowser.cpp
rename to src/gui/src/ZeroconfBrowser.cpp
diff --git a/src/gui/main/src/ZeroconfBrowser.h b/src/gui/src/ZeroconfBrowser.h
similarity index 100%
rename from src/gui/main/src/ZeroconfBrowser.h
rename to src/gui/src/ZeroconfBrowser.h
diff --git a/src/gui/main/src/ZeroconfRecord.h b/src/gui/src/ZeroconfRecord.h
similarity index 100%
rename from src/gui/main/src/ZeroconfRecord.h
rename to src/gui/src/ZeroconfRecord.h
diff --git a/src/gui/main/src/ZeroconfRegister.cpp b/src/gui/src/ZeroconfRegister.cpp
similarity index 100%
rename from src/gui/main/src/ZeroconfRegister.cpp
rename to src/gui/src/ZeroconfRegister.cpp
diff --git a/src/gui/main/src/ZeroconfRegister.h b/src/gui/src/ZeroconfRegister.h
similarity index 100%
rename from src/gui/main/src/ZeroconfRegister.h
rename to src/gui/src/ZeroconfRegister.h
diff --git a/src/gui/main/src/ZeroconfServer.cpp b/src/gui/src/ZeroconfServer.cpp
similarity index 100%
rename from src/gui/main/src/ZeroconfServer.cpp
rename to src/gui/src/ZeroconfServer.cpp
diff --git a/src/gui/main/src/ZeroconfServer.h b/src/gui/src/ZeroconfServer.h
similarity index 100%
rename from src/gui/main/src/ZeroconfServer.h
rename to src/gui/src/ZeroconfServer.h
diff --git a/src/gui/main/src/ZeroconfService.cpp b/src/gui/src/ZeroconfService.cpp
similarity index 100%
rename from src/gui/main/src/ZeroconfService.cpp
rename to src/gui/src/ZeroconfService.cpp
diff --git a/src/gui/main/src/ZeroconfService.h b/src/gui/src/ZeroconfService.h
similarity index 100%
rename from src/gui/main/src/ZeroconfService.h
rename to src/gui/src/ZeroconfService.h
diff --git a/src/gui/main/src/ZeroconfThread.cpp b/src/gui/src/ZeroconfThread.cpp
similarity index 100%
rename from src/gui/main/src/ZeroconfThread.cpp
rename to src/gui/src/ZeroconfThread.cpp
diff --git a/src/gui/main/src/ZeroconfThread.h b/src/gui/src/ZeroconfThread.h
similarity index 100%
rename from src/gui/main/src/ZeroconfThread.h
rename to src/gui/src/ZeroconfThread.h
diff --git a/src/gui/main/src/main.cpp b/src/gui/src/main.cpp
similarity index 100%
rename from src/gui/main/src/main.cpp
rename to src/gui/src/main.cpp