diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cfb7f9ab..72c48c80a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,7 +265,7 @@ endif(MINGW AND WIN32)
 set(APP_SOURCES
   ${APP_SOURCES}
 
-  # QtSingleApplication suite sources.
+  # QTSINGLEAPPLICATION sources.
   src/qtsingleapplication/qtlocalpeer.cpp
   src/qtsingleapplication/qtsingleapplication.cpp
 
@@ -276,9 +276,6 @@ set(APP_SOURCES
   src/gui/skinfactory.cpp
   src/gui/formsettings.cpp
   src/gui/formabout.cpp
-  src/gui/shortcutcatcher.cpp
-  src/gui/shortcutbutton.cpp
-  src/gui/dynamicshortcutswidget.cpp
   src/gui/baselineedit.cpp
   src/gui/locationlineedit.cpp
   src/gui/tabwidget.cpp
@@ -299,12 +296,17 @@ set(APP_SOURCES
   src/gui/formupdate.cpp
   src/gui/comboboxwithstatus.cpp
 
+  # DYNAMIC-SHORTCUTS sources.
+  src/dynamic-shortcuts/shortcutcatcher.cpp
+  src/dynamic-shortcuts/shortcutbutton.cpp
+  src/dynamic-shortcuts/dynamicshortcutswidget.cpp
+  src/dynamic-shortcuts/dynamicshortcuts.cpp
+
   # CORE sources.
   src/core/debugging.cpp
   src/core/settings.cpp
   src/core/systemfactory.cpp
   src/core/localization.cpp
-  src/core/dynamicshortcuts.cpp
   src/core/textfactory.cpp
   src/core/databasefactory.cpp
   src/core/messagesmodel.cpp
@@ -335,7 +337,7 @@ set(APP_SOURCES
 set(APP_HEADERS
   ${APP_HEADERS}
 
-  # QtSingleApplication suite headers.
+  # QTSINGLEAPPLICATION headers.
   src/qtsingleapplication/qtlocalpeer.h
   src/qtsingleapplication/qtsingleapplication.h
 
@@ -346,9 +348,6 @@ set(APP_HEADERS
   src/gui/skinfactory.h
   src/gui/formsettings.h
   src/gui/formabout.h
-  src/gui/shortcutcatcher.h
-  src/gui/shortcutbutton.h
-  src/gui/dynamicshortcutswidget.h
   src/gui/baselineedit.h
   src/gui/locationlineedit.h
   src/gui/tabwidget.h
@@ -368,10 +367,14 @@ set(APP_HEADERS
   src/gui/formupdate.h
   src/gui/comboboxwithstatus.h
 
+  # DYNAMIC-SHORTCUTS headers.
+  src/dynamic-shortcuts/dynamicshortcutswidget.h
+  src/dynamic-shortcuts/shortcutcatcher.h
+  src/dynamic-shortcuts/shortcutbutton.h
+
   # CORE headers.
   src/core/settings.h
   src/core/localization.h
-  src/network-web/webpage.h
   src/core/systemfactory.h
   src/core/databasefactory.h
   src/core/messagesmodel.h
@@ -381,6 +384,7 @@ set(APP_HEADERS
   src/core/feeddownloader.h
 
   # NETWORK-WEB headers.
+  src/network-web/webpage.h
   src/network-web/basenetworkaccessmanager.h
   src/network-web/webbrowsernetworkaccessmanager.h
   src/network-web/silentnetworkaccessmanager.h
@@ -457,6 +461,7 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}/src
   ${CMAKE_CURRENT_SOURCE_DIR}/src/gui
   ${CMAKE_CURRENT_SOURCE_DIR}/src/network-web
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/dynamic-shortcuts
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/src
 )
diff --git a/src/core/dynamicshortcuts.cpp b/src/dynamic-shortcuts/dynamicshortcuts.cpp
similarity index 97%
rename from src/core/dynamicshortcuts.cpp
rename to src/dynamic-shortcuts/dynamicshortcuts.cpp
index d0eab8f26..cc6b41cd5 100644
--- a/src/core/dynamicshortcuts.cpp
+++ b/src/dynamic-shortcuts/dynamicshortcuts.cpp
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
 
-#include "core/dynamicshortcuts.h"
+#include "dynamic-shortcuts/dynamicshortcuts.h"
 
 #include "core/defs.h"
 #include "core/settings.h"
diff --git a/src/core/dynamicshortcuts.h b/src/dynamic-shortcuts/dynamicshortcuts.h
similarity index 100%
rename from src/core/dynamicshortcuts.h
rename to src/dynamic-shortcuts/dynamicshortcuts.h
diff --git a/src/gui/dynamicshortcutswidget.cpp b/src/dynamic-shortcuts/dynamicshortcutswidget.cpp
old mode 100755
new mode 100644
similarity index 95%
rename from src/gui/dynamicshortcutswidget.cpp
rename to src/dynamic-shortcuts/dynamicshortcutswidget.cpp
index c54cd1265..aed1609c9
--- a/src/gui/dynamicshortcutswidget.cpp
+++ b/src/dynamic-shortcuts/dynamicshortcutswidget.cpp
@@ -15,11 +15,11 @@
 // You should have received a copy of the GNU General Public License
 // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
 
-#include "gui/dynamicshortcutswidget.h"
+#include "dynamic-shortcuts/dynamicshortcutswidget.h"
 
+#include "dynamic-shortcuts/shortcutcatcher.h"
+#include "dynamic-shortcuts/shortcutbutton.h"
 #include "core/defs.h"
-#include "gui/shortcutcatcher.h"
-#include "gui/shortcutbutton.h"
 
 #include <QGridLayout>
 #include <QAction>
diff --git a/src/gui/dynamicshortcutswidget.h b/src/dynamic-shortcuts/dynamicshortcutswidget.h
similarity index 100%
rename from src/gui/dynamicshortcutswidget.h
rename to src/dynamic-shortcuts/dynamicshortcutswidget.h
diff --git a/src/gui/shortcutbutton.cpp b/src/dynamic-shortcuts/shortcutbutton.cpp
similarity index 97%
rename from src/gui/shortcutbutton.cpp
rename to src/dynamic-shortcuts/shortcutbutton.cpp
index 868a514ae..e05501c9a 100644
--- a/src/gui/shortcutbutton.cpp
+++ b/src/dynamic-shortcuts/shortcutbutton.cpp
@@ -26,9 +26,9 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "gui/shortcutbutton.h"
+#include "dynamic-shortcuts/shortcutbutton.h"
 
-#include "gui/shortcutcatcher.h"
+#include "dynamic-shortcuts/shortcutcatcher.h"
 
 #include <QKeyEvent>
 
diff --git a/src/gui/shortcutbutton.h b/src/dynamic-shortcuts/shortcutbutton.h
similarity index 100%
rename from src/gui/shortcutbutton.h
rename to src/dynamic-shortcuts/shortcutbutton.h
diff --git a/src/gui/shortcutcatcher.cpp b/src/dynamic-shortcuts/shortcutcatcher.cpp
similarity index 97%
rename from src/gui/shortcutcatcher.cpp
rename to src/dynamic-shortcuts/shortcutcatcher.cpp
index ca231a8dc..7c19693ae 100644
--- a/src/gui/shortcutcatcher.cpp
+++ b/src/dynamic-shortcuts/shortcutcatcher.cpp
@@ -26,9 +26,9 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "gui/shortcutcatcher.h"
+#include "dynamic-shortcuts/shortcutcatcher.h"
 
-#include "gui/shortcutbutton.h"
+#include "dynamic-shortcuts/shortcutbutton.h"
 #include "gui/plaintoolbutton.h"
 #include "gui/iconthemefactory.h"
 
diff --git a/src/gui/shortcutcatcher.h b/src/dynamic-shortcuts/shortcutcatcher.h
similarity index 100%
rename from src/gui/shortcutcatcher.h
rename to src/dynamic-shortcuts/shortcutcatcher.h
diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp
index c39ea1196..967f5072f 100755
--- a/src/gui/formsettings.cpp
+++ b/src/gui/formsettings.cpp
@@ -23,12 +23,12 @@
 #include "core/localization.h"
 #include "core/systemfactory.h"
 #include "core/feeddownloader.h"
-#include "core/dynamicshortcuts.h"
+#include "core/feedsmodel.h"
+#include "dynamic-shortcuts/dynamicshortcuts.h"
 #include "network-web/webfactory.h"
 #include "network-web/webbrowsernetworkaccessmanager.h"
 #include "network-web/silentnetworkaccessmanager.h"
 #include "network-web/webbrowser.h"
-#include "core/feedsmodel.h"
 #include "gui/iconthemefactory.h"
 #include "gui/skinfactory.h"
 #include "gui/systemtrayicon.h"
diff --git a/src/main.cpp b/src/main.cpp
index 2f68ad34e..d5b12a38e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,7 @@
 #include "core/debugging.h"
 #include "core/localization.h"
 #include "core/settings.h"
-#include "core/dynamicshortcuts.h"
+#include "dynamic-shortcuts/dynamicshortcuts.h"
 #include "gui/iconthemefactory.h"
 #include "gui/skinfactory.h"
 #include "gui/formmain.h"