diff --git a/Makefile b/Makefile
index 0315d98..501708f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ PO_OUTS = $(patsubst locale/%.po,locale/%.mo,$(PO_SRCS))
 PO_DIRS = $(wildcard locale/*/*)
 
 SRCS    = $(wildcard src/*.c) $(wildcard src/*/*.c)
+HDRS    = $(wildcard src/*.h) $(wildcard src/*/*.h)
 OBJS    = $(patsubst src/%.c,dist/%.o,$(SRCS))
-HDRS    = $(wildcard include/*.h)
 CFLAGS  = -O3 -fstack-protector-strong -fcf-protection=full -fstack-clash-protection
 LIBS    = -linih -lmp
 
diff --git a/locale/tr/LC_MESSAGES/pooler.po b/locale/tr/LC_MESSAGES/matt.po
similarity index 63%
rename from locale/tr/LC_MESSAGES/pooler.po
rename to locale/tr/LC_MESSAGES/matt.po
index 308e579..de66785 100644
--- a/locale/tr/LC_MESSAGES/pooler.po
+++ b/locale/tr/LC_MESSAGES/matt.po
@@ -20,119 +20,114 @@ msgstr ""
 #: src/config.c:70
 #, c-format
 msgid "Unknown configuration option: %s/%s"
-msgstr ""
+msgstr "Unknown configuration option: %s/%s"
 
 #: src/config.c:78
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to access the configuration file: %s"
-msgstr "Kayıt dosyasını açmak başarısız oldu: %s"
+msgstr "Failed to access the configuration file: %s"
 
 #: src/config.c:83
-#, fuzzy
 msgid "Failed to parse the configuration"
-msgstr "Kayıt dosyasını açmak başarısız oldu: %s"
+msgstr "Failed to parse the configuration"
 
 #: src/config.c:88
-#, fuzzy
 msgid "Please specify \"tmpdir\" in the configuration"
-msgstr "Lütfen konfigürasyonda en az bir havuz belirtin"
+msgstr "Please specify \"tmpdir\" in the configuration"
 
 #: src/config.c:93
-#, fuzzy
 msgid "Please specify \"datadir\" in the configuration"
-msgstr "Lütfen konfigürasyonda en az bir havuz belirtin"
+msgstr "Please specify \"datadir\" in the configuration"
 
 #: src/config.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "URL not specified for the pool: %s"
-msgstr "Ana makine adı havuz konfigürasyonunda belirtilmedi, geçiliyor: %s"
+msgstr "URL not specified for the pool: %s"
 
 #: src/log.c:91
 msgid "y"
-msgstr ""
+msgstr "y"
 
 #: src/log.c:91
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
 #: src/log.c:92
 msgid "n"
-msgstr ""
+msgstr "n"
 
 #: src/log.c:92
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: src/log.c:95
 #, c-format
 msgid "%s [y/N] "
-msgstr ""
+msgstr "%s [y/N] "
 
 #: src/log.c:115
 msgid "Please answer with y/n"
-msgstr ""
+msgstr "Please answer with y/n"
 
 #: src/main.c:48
 msgid "Received a segfault"
-msgstr ""
+msgstr "Received a segfault"
 
 #: src/main.c:93
 msgid "Failed to access the root directory, are you running as root?"
-msgstr ""
+msgstr "Failed to access the root directory, are you running as root?"
 
 #: src/main.c:95
-#, fuzzy, c-format
+#, c-format
 msgid "Bad root directory (%s): %s"
-msgstr "Havuz dizini kullanmak başarısız oldu: %s"
+msgstr "Bad root directory (%s): %s"
 
 #: src/main.c:103
 #, c-format
 msgid "Bad datadir (%s): %s"
-msgstr ""
+msgstr "Bad datadir (%s): %s"
 
 #: src/main.c:108
 #, c-format
 msgid "Bad tmpdir (%s): %s"
-msgstr ""
+msgstr "Bad tmpdir (%s): %s"
 
 #: src/main.c:115
-#, fuzzy
 msgid "Failed to add pool "
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Failed to add pool "
 
 #: src/main.c:127
 msgid "Failed to lock, matt is already running"
-msgstr ""
+msgstr "Failed to lock, matt is already running"
 
 #: src/main.c:131
-#, fuzzy
 msgid "Failed to lock, are you root?"
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Failed to lock, are you root?"
 
 #: src/main.c:142
 msgid "Command not found: "
-msgstr ""
+msgstr "Command not found: "
 
 #: src/main.c:144
 #, c-format
 msgid "MatterLinux package manager (version %s)"
-msgstr ""
+msgstr "MatterLinux package manager (version %s)"
 
 #: src/main.c:145
 msgid "Usage: "
-msgstr ""
+msgstr "Usage: "
 
 #: src/main.c:147
 msgid "Here is a list of available commands:"
-msgstr ""
+msgstr "Here is a list of available commands:"
 
 #: src/main.c:153
 msgid "To list different options, use commands with "
-msgstr ""
+msgstr "To list different options, use commands with "
 
 #: src/main.c:154
 msgid "Here is a list of available global options:"
-msgstr ""
+msgstr "Here is a list of available global options:"
 
 #: src/main.c:157 src/main.c:158 src/cmd/info.c:42 src/cmd/info.c:43
 #: src/cmd/info.c:44 src/cmd/install.c:25 src/cmd/install.c:26
@@ -140,279 +135,226 @@ msgstr ""
 #: src/cmd/update.c:29
 #, c-format
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: src/main.c:160
 msgid ""
 "Licensed under GPLv3, see https://www.gnu.org/licenses/ for more information"
 msgstr ""
+"Licensed under GPLv3, see https://www.gnu.org/licenses/ for more information"
 
 #: src/util.c:83
 msgid "No available editor to open "
-msgstr ""
+msgstr "No available editor to open "
 
 #: src/util.c:90
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to run the editor: %s"
-msgstr "Sunucuyu başlatmak başarısız oldu: %s"
+msgstr "Failed to run the editor: %s"
 
 #: src/util.c:95
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open the editor: %s"
-msgstr "Sunucuyu başlatmak başarısız oldu: %s"
+msgstr "Failed to open the editor: %s"
 
 #: src/cmd/info.c:18 src/cmd/info.c:28 src/cmd/install.c:59 src/cmd/remove.c:45
 msgid "Package "
-msgstr ""
+msgstr "Package "
 
 #: src/cmd/info.c:41 src/cmd/list.c:12
 msgid "Listing options for the list command:"
-msgstr ""
+msgstr "Listing options for the list command:"
 
 #: src/cmd/info.c:65
 msgid "Please specify only a single package name"
-msgstr ""
+msgstr "Please specify only a single package name"
 
 #: src/cmd/info.c:71
-#, fuzzy
 msgid "Please specify a single package"
-msgstr "Lütfen konfigürasyonda en az bir havuz belirtin"
+msgstr "Please specify a single package"
 
 #: src/cmd/info.c:86
-#, fuzzy
 msgid "Failed to get the changes file for "
-msgstr "%s: paket listesini yüklemek başarısız oldu (%s)"
+msgstr "Failed to get the changes file for "
 
 #: src/cmd/info.c:92
-#, fuzzy
 msgid "Failed to access the changes file, is the package installed?"
-msgstr "%s: paket listesini yüklemek başarısız oldu (%s)"
+msgstr "Failed to access the changes file, is the package installed?"
 
 #: src/cmd/info.c:99
-#, fuzzy
 msgid "Failed to get the depends list for "
-msgstr "%s: paket listesini yüklemek başarısız oldu (%s)"
+msgstr "Failed to get the depends list for "
 
 #: src/cmd/info.c:126
 #, c-format
 msgid "Name       "
-msgstr ""
+msgstr "Name       "
 
 #: src/cmd/info.c:127
 #, c-format
 msgid "Version    "
-msgstr ""
+msgstr "Version    "
 
 #: src/cmd/info.c:128
 #, c-format
 msgid "Desc       "
-msgstr ""
+msgstr "Desc       "
 
 #: src/cmd/info.c:129
 #, c-format
 msgid "Size       "
-msgstr ""
+msgstr "Size       "
 
 #: src/cmd/info.c:132
 #, c-format
 msgid "Depends    "
-msgstr ""
+msgstr "Depends    "
 
 #: src/cmd/info.c:135
 #, c-format
 msgid "Changes    "
-msgstr ""
+msgstr "Changes    "
 
 #: src/cmd/info.c:139 src/cmd/info.c:140
 #, c-format
 msgid "Installed  "
-msgstr ""
+msgstr "Installed  "
 
 #: src/cmd/info.c:142 src/cmd/info.c:143
 #, c-format
 msgid "Up-to-date "
-msgstr ""
+msgstr "Up-to-date "
 
 #: src/cmd/install.c:24
 msgid "Listing options for the install command:"
-msgstr ""
+msgstr "Listing options for the install command:"
 
 #: src/cmd/install.c:31 src/cmd/update.c:34
 msgid "There are no avaliable pools, have you synced yet?"
-msgstr ""
+msgstr "There are no avaliable pools, have you synced yet?"
 
 #: src/cmd/install.c:51 src/cmd/remove.c:47
-#, fuzzy
 msgid "Failed to find "
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Failed to find "
 
 #: src/cmd/install.c:65
-#, fuzzy
 msgid "Failed to resolve "
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Failed to resolve "
 
 #: src/cmd/install.c:71
 msgid "Nothing to do (no packages to install)"
-msgstr ""
+msgstr "Nothing to do (no packages to install)"
 
 #: src/cmd/install.c:80 src/cmd/install.c:82 src/cmd/remove.c:67
 #: src/cmd/remove.c:69 src/cmd/update.c:55 src/cmd/update.c:57
 msgid "Following "
-msgstr ""
+msgstr "Following "
 
 #: src/cmd/install.c:88 src/cmd/remove.c:76
 msgid "Total of "
-msgstr ""
+msgstr "Total of "
 
 #: src/cmd/install.c:91 src/cmd/update.c:64
 #, c-format
 msgid "Root directory is modified, install scripts will be saved in %s"
-msgstr ""
+msgstr "Root directory is modified, install scripts will be saved in %s"
 
 #: src/cmd/install.c:93 src/cmd/remove.c:77 src/cmd/update.c:66
 msgid "Continue?"
-msgstr ""
+msgstr "Continue?"
 
 #: src/cmd/install.c:94 src/cmd/remove.c:78 src/cmd/update.c:67
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Operation cancelled"
 
 #: src/cmd/install.c:100 src/cmd/install.c:115 src/cmd/remove.c:85
 #: src/cmd/update.c:77 src/cmd/update.c:86 src/cmd/update.c:95
 msgid "("
-msgstr ""
+msgstr "("
 
 #: src/cmd/install.c:106 src/cmd/update.c:82
-#, fuzzy
 msgid "Failed to download "
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Failed to download "
 
 #: src/cmd/install.c:121 src/cmd/update.c:100
-#, fuzzy
 msgid "Failed to install "
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Failed to install "
 
 #: src/cmd/install.c:127
 msgid "Installed "
-msgstr ""
+msgstr "Installed "
 
 #: src/cmd/install.c:127
 msgid "Installed all of the "
-msgstr ""
+msgstr "Installed all of the "
 
 #: src/cmd/list.c:27
 msgid "There no installed packages"
-msgstr ""
+msgstr "There no installed packages"
 
 #: src/cmd/list.c:32
 msgid "Listing "
-msgstr ""
+msgstr "Listing "
 
 #: src/cmd/remove.c:19
 msgid "Listing options for the remove command:"
-msgstr ""
+msgstr "Listing options for the remove command:"
 
 #: src/cmd/remove.c:52
-#, fuzzy
 msgid "Cannot remove "
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Cannot remove "
 
 #: src/cmd/remove.c:60
 msgid "Nothing to do (no packages to remove)"
-msgstr ""
+msgstr "Nothing to do (no packages to remove)"
 
 #: src/cmd/remove.c:91 src/cmd/update.c:91
-#, fuzzy
 msgid "Failed to remove "
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Failed to remove "
 
 #: src/cmd/remove.c:97
 msgid "Removed "
-msgstr ""
+msgstr "Removed "
 
 #: src/cmd/remove.c:97
 msgid "Removed all of the "
-msgstr ""
+msgstr "Removed all of the "
 
 #: src/cmd/sync.c:19
-#, fuzzy
 msgid "Failed to sync "
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Failed to sync "
 
 #: src/cmd/sync.c:28 src/cmd/sync.c:58
 msgid "Synced "
-msgstr ""
+msgstr "Synced "
 
 #: src/cmd/sync.c:34
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to sync %s: %s"
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Failed to sync %s: %s"
 
 #: src/cmd/sync.c:46
-#, fuzzy
 msgid "There are no pools specified in the configuration"
-msgstr "Lütfen konfigürasyonda en az bir havuz belirtin"
+msgstr "There are no pools specified in the configuration"
 
 #: src/cmd/sync.c:54
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to sync pools: %s"
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
+msgstr "Failed to sync pools: %s"
 
 #: src/cmd/update.c:28
 msgid "Listing options for the update command:"
-msgstr ""
+msgstr "Listing options for the update command:"
 
 #: src/cmd/update.c:45
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get the package update list: %s"
-msgstr "%s: paket listesini yüklemek başarısız oldu (%s)"
+msgstr "Failed to get the package update list: %s"
 
 #: src/cmd/update.c:50
 msgid "All packages are up-to-date"
-msgstr ""
+msgstr "All packages are up-to-date"
 
 #: src/cmd/update.c:73
-#, fuzzy
 msgid "Failed to update "
-msgstr "Havuzları sekronize etmek başarısız oldu: %s"
-
-#, fuzzy
-#~ msgid "Syncing "
-#~ msgstr "%lu tane havuz %s adresinde sunuluyor"
-
-#, fuzzy, c-format
-#~ msgid "Failed to add pool \"%s\" to the list: %s"
-#~ msgstr "Havuzu listeye eklemek başarısız oldu: %s"
-
-#, c-format
-#~ msgid "%s: successfuly loaded the pool info"
-#~ msgstr "%s: havuz bilgisi başarıyla yüklendi"
-
-#, c-format
-#~ msgid "%s: failed to load the pool info (%s)"
-#~ msgstr "%s: havuz bilgisini yüklemek başarısız oldu (%s)"
-
-#, c-format
-#~ msgid "%s: successfuly loaded the package list"
-#~ msgstr "%s: paket listesi başarıyla yüklendi"
-
-#~ msgid "Configuration file not specified"
-#~ msgstr "Konfigürasyon dosyası belirtilmedi"
-
-#~ msgid "Please specify a valid thread count (1-1000)"
-#~ msgstr "Lütfen geçerli bir işlem sayısı belirtin (1-1000)"
-
-#~ msgid "Pool directory not specified"
-#~ msgstr "Havuz dizini belirtilmemiş"
-
-#, c-format
-#~ msgid "Cannot access to the pool directory: %s"
-#~ msgstr "Havuz dizinine erişilemiyor: %s"
-
-#, fuzzy
-#~ msgid "None of the pools is available for serving"
-#~ msgstr "Havuzların hiçbiri sunmak için müsait değil"
-
-#, c-format
-#~ msgid "Serving %lu pools on %s"
-#~ msgstr "%lu tane havuz %s adresinde sunuluyor"
+msgstr "Failed to update "