diff --git a/src/common/CMakeLists.txt b/src/core/CMakeLists.txt
similarity index 100%
rename from src/common/CMakeLists.txt
rename to src/core/CMakeLists.txt
diff --git a/src/common/Makefile.am b/src/core/Makefile.am
similarity index 100%
rename from src/common/Makefile.am
rename to src/core/Makefile.am
diff --git a/src/common/alias.c b/src/core/wee-alias.c
similarity index 100%
rename from src/common/alias.c
rename to src/core/wee-alias.c
diff --git a/src/common/alias.h b/src/core/wee-alias.h
similarity index 100%
rename from src/common/alias.h
rename to src/core/wee-alias.h
diff --git a/src/common/backtrace.c b/src/core/wee-backtrace.c
similarity index 100%
rename from src/common/backtrace.c
rename to src/core/wee-backtrace.c
diff --git a/src/common/backtrace.h b/src/core/wee-backtrace.h
similarity index 100%
rename from src/common/backtrace.h
rename to src/core/wee-backtrace.h
diff --git a/src/common/command.c b/src/core/wee-command.c
similarity index 100%
rename from src/common/command.c
rename to src/core/wee-command.c
diff --git a/src/common/command.h b/src/core/wee-command.h
similarity index 100%
rename from src/common/command.h
rename to src/core/wee-command.h
diff --git a/src/common/weeconfig.c b/src/core/wee-config.c
similarity index 100%
rename from src/common/weeconfig.c
rename to src/core/wee-config.c
diff --git a/src/common/weeconfig.h b/src/core/wee-config.h
similarity index 100%
rename from src/common/weeconfig.h
rename to src/core/wee-config.h
diff --git a/src/common/weelist.c b/src/core/wee-list.c
similarity index 100%
rename from src/common/weelist.c
rename to src/core/wee-list.c
diff --git a/src/common/weelist.h b/src/core/wee-list.h
similarity index 100%
rename from src/common/weelist.h
rename to src/core/wee-list.h
diff --git a/src/common/log.c b/src/core/wee-log.c
similarity index 100%
rename from src/common/log.c
rename to src/core/wee-log.c
diff --git a/src/common/log.h b/src/core/wee-log.h
similarity index 100%
rename from src/common/log.h
rename to src/core/wee-log.h
diff --git a/src/common/session.c b/src/core/wee-upgrade.c
similarity index 100%
rename from src/common/session.c
rename to src/core/wee-upgrade.c
diff --git a/src/common/session.h b/src/core/wee-upgrade.h
similarity index 100%
rename from src/common/session.h
rename to src/core/wee-upgrade.h
diff --git a/src/common/utf8.c b/src/core/wee-utf8.c
similarity index 100%
rename from src/common/utf8.c
rename to src/core/wee-utf8.c
diff --git a/src/common/utf8.h b/src/core/wee-utf8.h
similarity index 100%
rename from src/common/utf8.h
rename to src/core/wee-utf8.h
diff --git a/src/common/util.c b/src/core/wee-util.c
similarity index 100%
rename from src/common/util.c
rename to src/core/wee-util.c
diff --git a/src/common/util.h b/src/core/wee-util.h
similarity index 100%
rename from src/common/util.h
rename to src/core/wee-util.h
diff --git a/src/common/weechat.c b/src/core/weechat.c
similarity index 100%
rename from src/common/weechat.c
rename to src/core/weechat.c
diff --git a/src/common/weechat.h b/src/core/weechat.h
similarity index 100%
rename from src/common/weechat.h
rename to src/core/weechat.h
diff --git a/src/common/completion.c b/src/gui/gui-completion.c
similarity index 100%
rename from src/common/completion.c
rename to src/gui/gui-completion.c
diff --git a/src/common/completion.h b/src/gui/gui-completion.h
similarity index 100%
rename from src/common/completion.h
rename to src/gui/gui-completion.h
diff --git a/src/common/history.c b/src/gui/gui-history.c
similarity index 100%
rename from src/common/history.c
rename to src/gui/gui-history.c
diff --git a/src/common/history.h b/src/gui/gui-history.h
similarity index 100%
rename from src/common/history.h
rename to src/gui/gui-history.h
diff --git a/src/common/hotlist.c b/src/gui/gui-hotlist.c
similarity index 100%
rename from src/common/hotlist.c
rename to src/gui/gui-hotlist.c
diff --git a/src/common/hotlist.h b/src/gui/gui-hotlist.h
similarity index 100%
rename from src/common/hotlist.h
rename to src/gui/gui-hotlist.h
diff --git a/src/common/fifo.c b/src/plugins/fifo/fifo.c
similarity index 100%
rename from src/common/fifo.c
rename to src/plugins/fifo/fifo.c
diff --git a/src/common/fifo.h b/src/plugins/fifo/fifo.h
similarity index 100%
rename from src/common/fifo.h
rename to src/plugins/fifo/fifo.h