diff --git a/profiles/CDS+/amd64/make.defaults b/profiles/CDS+/amd64/make.defaults
index c0247f4..efbabb6 100644
--- a/profiles/CDS+/amd64/make.defaults
+++ b/profiles/CDS+/amd64/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CDS/x86_64"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CDS/grp/x86_64"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CDS/grp/x86_64"
+PKGDIR="/var/calculate/remote/packages/CDS+/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CDS+/x86_64"
diff --git a/profiles/CDS+/x86/make.defaults b/profiles/CDS+/x86/make.defaults
index e67e967..f69a899 100644
--- a/profiles/CDS+/x86/make.defaults
+++ b/profiles/CDS+/x86/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CDS/i686"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CDS/grp/i686"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CDS/grp/i686"
+PKGDIR="/var/calculate/remote/packages/CDS+/i686"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CDS+/i686"
diff --git a/profiles/CDS/amd64/make.defaults b/profiles/CDS/amd64/make.defaults
index c0247f4..f729872 100644
--- a/profiles/CDS/amd64/make.defaults
+++ b/profiles/CDS/amd64/make.defaults
@@ -1,4 +1,2 @@
 PKGDIR="/var/calculate/remote/packages/CDS/x86_64"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CDS/grp/x86_64"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CDS/grp/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CDS+/x86_64"
diff --git a/profiles/CDS/x86/make.defaults b/profiles/CDS/x86/make.defaults
index e67e967..a454cb3 100644
--- a/profiles/CDS/x86/make.defaults
+++ b/profiles/CDS/x86/make.defaults
@@ -1,4 +1,2 @@
 PKGDIR="/var/calculate/remote/packages/CDS/i686"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CDS/grp/i686"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CDS/grp/i686"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CDS+/i686"
diff --git a/profiles/CLD+/amd64/make.defaults b/profiles/CLD+/amd64/make.defaults
index c22b628..95f011f 100644
--- a/profiles/CLD+/amd64/make.defaults
+++ b/profiles/CLD+/amd64/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CLD/x86_64"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLD/grp/x86_64"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLD/grp/x86_64"
+PKGDIR="/var/calculate/remote/packages/CLD+/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLD+/x86_64"
diff --git a/profiles/CLD+/x86/make.defaults b/profiles/CLD+/x86/make.defaults
index 315f5c5..3fdbc3c 100644
--- a/profiles/CLD+/x86/make.defaults
+++ b/profiles/CLD+/x86/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CLD/i686"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLD/grp/i686"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLD/grp/i686"
+PKGDIR="/var/calculate/remote/packages/CLD+/i686"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLD+/i686"
diff --git a/profiles/CLD/amd64/make.defaults b/profiles/CLD/amd64/make.defaults
index c22b628..9321ef6 100644
--- a/profiles/CLD/amd64/make.defaults
+++ b/profiles/CLD/amd64/make.defaults
@@ -1,4 +1,2 @@
 PKGDIR="/var/calculate/remote/packages/CLD/x86_64"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLD/grp/x86_64"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLD/grp/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLD+/x86_64"
diff --git a/profiles/CLD/x86/make.defaults b/profiles/CLD/x86/make.defaults
index 315f5c5..2069bc6 100644
--- a/profiles/CLD/x86/make.defaults
+++ b/profiles/CLD/x86/make.defaults
@@ -1,4 +1,2 @@
 PKGDIR="/var/calculate/remote/packages/CLD/i686"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLD/grp/i686"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLD/grp/i686"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLD+/i686"
diff --git a/profiles/CLDX+/amd64/make.defaults b/profiles/CLDX+/amd64/make.defaults
index 3b63686..c0664d5 100644
--- a/profiles/CLDX+/amd64/make.defaults
+++ b/profiles/CLDX+/amd64/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CLDX/x86_64"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/x86_64"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/x86_64"
+PKGDIR="/var/calculate/remote/packages/CLDX+/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLDX+/x86_64"
diff --git a/profiles/CLDX+/x86/make.defaults b/profiles/CLDX+/x86/make.defaults
index 55c1336..db1dd30 100644
--- a/profiles/CLDX+/x86/make.defaults
+++ b/profiles/CLDX+/x86/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CLDX/i686"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/i686"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/i686"
+PKGDIR="/var/calculate/remote/packages/CLDX+/i686"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLDX+/i686"
diff --git a/profiles/CLDX/amd64/make.defaults b/profiles/CLDX/amd64/make.defaults
index 3b63686..b116c0f 100644
--- a/profiles/CLDX/amd64/make.defaults
+++ b/profiles/CLDX/amd64/make.defaults
@@ -1,4 +1,2 @@
 PKGDIR="/var/calculate/remote/packages/CLDX/x86_64"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/x86_64"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLDX+/x86_64"
diff --git a/profiles/CLDX/x86/make.defaults b/profiles/CLDX/x86/make.defaults
index 55c1336..eceb630 100644
--- a/profiles/CLDX/x86/make.defaults
+++ b/profiles/CLDX/x86/make.defaults
@@ -1,4 +1,2 @@
 PKGDIR="/var/calculate/remote/packages/CLDX/i686"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/i686"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/i686"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLDX+/i686"
diff --git a/profiles/CLS/amd64/make.defaults b/profiles/CLS/amd64/make.defaults
index 3b63686..4aa1a2f 100644
--- a/profiles/CLS/amd64/make.defaults
+++ b/profiles/CLS/amd64/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CLDX/x86_64"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/x86_64"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/x86_64"
+PKGDIR="/var/calculate/remote/packages/CLS/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLDX+/x86_64"
diff --git a/profiles/CLS/x86/make.defaults b/profiles/CLS/x86/make.defaults
index 55c1336..90da258 100644
--- a/profiles/CLS/x86/make.defaults
+++ b/profiles/CLS/x86/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CLDX/i686"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/i686"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/i686"
+PKGDIR="/var/calculate/remote/packages/CLS/i686"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLDX+/i686"
diff --git a/profiles/CLSM/amd64/make.defaults b/profiles/CLSM/amd64/make.defaults
index 3b63686..80fad84 100644
--- a/profiles/CLSM/amd64/make.defaults
+++ b/profiles/CLSM/amd64/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CLDX/x86_64"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/x86_64"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/x86_64"
+PKGDIR="/var/calculate/remote/packages/CLSM/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLDX+/x86_64"
diff --git a/profiles/CLSM/x86/make.defaults b/profiles/CLSM/x86/make.defaults
index 55c1336..0641885 100644
--- a/profiles/CLSM/x86/make.defaults
+++ b/profiles/CLSM/x86/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CLDX/i686"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/i686"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/i686"
+PKGDIR="/var/calculate/remote/packages/CLSM/i686"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLDX+/i686"
diff --git a/profiles/CMC/amd64/make.defaults b/profiles/CMC/amd64/make.defaults
index 3b63686..947b0ec 100644
--- a/profiles/CMC/amd64/make.defaults
+++ b/profiles/CMC/amd64/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CLDX/x86_64"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/x86_64"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/x86_64"
+PKGDIR="/var/calculate/remote/packages/CMC/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLDX+/x86_64"
diff --git a/profiles/CMC/x86/make.defaults b/profiles/CMC/x86/make.defaults
index 55c1336..98521b1 100644
--- a/profiles/CMC/x86/make.defaults
+++ b/profiles/CMC/x86/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CLDX/i686"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CLDX/grp/i686"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CLDX/grp/i686"
+PKGDIR="/var/calculate/remote/packages/CMC/i686"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CLDX+/i686"
diff --git a/profiles/CSS/amd64/make.defaults b/profiles/CSS/amd64/make.defaults
index c0247f4..0234f18 100644
--- a/profiles/CSS/amd64/make.defaults
+++ b/profiles/CSS/amd64/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CDS/x86_64"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CDS/grp/x86_64"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CDS/grp/x86_64"
+PKGDIR="/var/calculate/remote/packages/CSS/x86_64"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CDS+/x86_64"
diff --git a/profiles/CSS/x86/make.defaults b/profiles/CSS/x86/make.defaults
index e67e967..522b5a1 100644
--- a/profiles/CSS/x86/make.defaults
+++ b/profiles/CSS/x86/make.defaults
@@ -1,4 +1,2 @@
-PKGDIR="/var/calculate/remote/packages/CDS/i686"
-
-#PORTAGE_BINHOST="http://mirror.yandex.ru/calculate/CDS/grp/i686"
-PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/CDS/grp/i686"
+PKGDIR="/var/calculate/remote/packages/CSS/i686"
+PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/grp/CDS+/i686"