diff --git a/Makefile b/Makefile
index c1e5cc610..ee7d42b08 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PKGNAME = entropy
 PYTHON = python2
-SUBDIRS = server magneto misc/po
+SUBDIRS = server magneto client/po
 SERVER_INSPKGS = reagent.py activator.py server_reagent.py server_activator.py server_query.py
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
diff --git a/misc/po/.tx/config b/client/po/.tx/config
similarity index 100%
rename from misc/po/.tx/config
rename to client/po/.tx/config
diff --git a/misc/po/Makefile b/client/po/Makefile
similarity index 100%
rename from misc/po/Makefile
rename to client/po/Makefile
diff --git a/misc/po/POTFILES.in b/client/po/POTFILES.in
similarity index 100%
rename from misc/po/POTFILES.in
rename to client/po/POTFILES.in
diff --git a/misc/po/TRANSIFEX_README b/client/po/TRANSIFEX_README
similarity index 100%
rename from misc/po/TRANSIFEX_README
rename to client/po/TRANSIFEX_README
diff --git a/misc/po/bg.po b/client/po/bg.po
similarity index 100%
rename from misc/po/bg.po
rename to client/po/bg.po
diff --git a/misc/po/ca.po b/client/po/ca.po
similarity index 100%
rename from misc/po/ca.po
rename to client/po/ca.po
diff --git a/misc/po/cs.po b/client/po/cs.po
similarity index 100%
rename from misc/po/cs.po
rename to client/po/cs.po
diff --git a/misc/po/da.po b/client/po/da.po
similarity index 100%
rename from misc/po/da.po
rename to client/po/da.po
diff --git a/misc/po/de.po b/client/po/de.po
similarity index 100%
rename from misc/po/de.po
rename to client/po/de.po
diff --git a/misc/po/entropy.pot b/client/po/entropy.pot
similarity index 100%
rename from misc/po/entropy.pot
rename to client/po/entropy.pot
diff --git a/misc/po/es.po b/client/po/es.po
similarity index 100%
rename from misc/po/es.po
rename to client/po/es.po
diff --git a/misc/po/es_CL.po b/client/po/es_CL.po
similarity index 100%
rename from misc/po/es_CL.po
rename to client/po/es_CL.po
diff --git a/misc/po/fr.po b/client/po/fr.po
similarity index 100%
rename from misc/po/fr.po
rename to client/po/fr.po
diff --git a/misc/po/fr_CA.po b/client/po/fr_CA.po
similarity index 100%
rename from misc/po/fr_CA.po
rename to client/po/fr_CA.po
diff --git a/misc/po/it.po b/client/po/it.po
similarity index 100%
rename from misc/po/it.po
rename to client/po/it.po
diff --git a/misc/po/nl.po b/client/po/nl.po
similarity index 100%
rename from misc/po/nl.po
rename to client/po/nl.po
diff --git a/misc/po/pl.po b/client/po/pl.po
similarity index 100%
rename from misc/po/pl.po
rename to client/po/pl.po
diff --git a/misc/po/pt.po b/client/po/pt.po
similarity index 100%
rename from misc/po/pt.po
rename to client/po/pt.po
diff --git a/misc/po/pt_BR.po b/client/po/pt_BR.po
similarity index 100%
rename from misc/po/pt_BR.po
rename to client/po/pt_BR.po
diff --git a/misc/po/ru.po b/client/po/ru.po
similarity index 100%
rename from misc/po/ru.po
rename to client/po/ru.po
diff --git a/misc/po/sk.po b/client/po/sk.po
similarity index 100%
rename from misc/po/sk.po
rename to client/po/sk.po
diff --git a/misc/po/sv.po b/client/po/sv.po
similarity index 100%
rename from misc/po/sv.po
rename to client/po/sv.po
diff --git a/misc/po/uk.po b/client/po/uk.po
similarity index 100%
rename from misc/po/uk.po
rename to client/po/uk.po
diff --git a/misc/po/zh_TW.po b/client/po/zh_TW.po
similarity index 100%
rename from misc/po/zh_TW.po
rename to client/po/zh_TW.po