diff --git a/packages/tools/array.ts b/@packages/tools/array.ts
similarity index 100%
rename from packages/tools/array.ts
rename to @packages/tools/array.ts
diff --git a/packages/tools/entity.ts b/@packages/tools/entity.ts
similarity index 100%
rename from packages/tools/entity.ts
rename to @packages/tools/entity.ts
diff --git a/packages/tools/mobx.ts b/@packages/tools/mobx.ts
similarity index 100%
rename from packages/tools/mobx.ts
rename to @packages/tools/mobx.ts
diff --git a/packages/tools/number.ts b/@packages/tools/number.ts
similarity index 100%
rename from packages/tools/number.ts
rename to @packages/tools/number.ts
diff --git a/packages/tools/object.ts b/@packages/tools/object.ts
similarity index 100%
rename from packages/tools/object.ts
rename to @packages/tools/object.ts
diff --git a/packages/tools/package.json b/@packages/tools/package.json
similarity index 100%
rename from packages/tools/package.json
rename to @packages/tools/package.json
diff --git a/packages/ui/colors.js b/@packages/ui/colors.js
similarity index 100%
rename from packages/ui/colors.js
rename to @packages/ui/colors.js
diff --git a/packages/ui/elements/Alert.js b/@packages/ui/elements/Alert.js
similarity index 100%
rename from packages/ui/elements/Alert.js
rename to @packages/ui/elements/Alert.js
diff --git a/packages/ui/elements/Button.tsx b/@packages/ui/elements/Button.tsx
similarity index 100%
rename from packages/ui/elements/Button.tsx
rename to @packages/ui/elements/Button.tsx
diff --git a/packages/ui/elements/Checkbox.tsx b/@packages/ui/elements/Checkbox.tsx
similarity index 100%
rename from packages/ui/elements/Checkbox.tsx
rename to @packages/ui/elements/Checkbox.tsx
diff --git a/packages/ui/elements/Input.tsx b/@packages/ui/elements/Input.tsx
similarity index 100%
rename from packages/ui/elements/Input.tsx
rename to @packages/ui/elements/Input.tsx
diff --git a/packages/ui/elements/InputNumber.tsx b/@packages/ui/elements/InputNumber.tsx
similarity index 100%
rename from packages/ui/elements/InputNumber.tsx
rename to @packages/ui/elements/InputNumber.tsx
diff --git a/packages/ui/elements/Link.tsx b/@packages/ui/elements/Link.tsx
similarity index 100%
rename from packages/ui/elements/Link.tsx
rename to @packages/ui/elements/Link.tsx
diff --git a/packages/ui/elements/Radio.tsx b/@packages/ui/elements/Radio.tsx
similarity index 100%
rename from packages/ui/elements/Radio.tsx
rename to @packages/ui/elements/Radio.tsx
diff --git a/packages/ui/elements/Result.js b/@packages/ui/elements/Result.js
similarity index 100%
rename from packages/ui/elements/Result.js
rename to @packages/ui/elements/Result.js
diff --git a/packages/ui/elements/Segmented.tsx b/@packages/ui/elements/Segmented.tsx
similarity index 100%
rename from packages/ui/elements/Segmented.tsx
rename to @packages/ui/elements/Segmented.tsx
diff --git a/packages/ui/elements/Select.tsx b/@packages/ui/elements/Select.tsx
similarity index 100%
rename from packages/ui/elements/Select.tsx
rename to @packages/ui/elements/Select.tsx
diff --git a/packages/ui/elements/Switch.tsx b/@packages/ui/elements/Switch.tsx
similarity index 100%
rename from packages/ui/elements/Switch.tsx
rename to @packages/ui/elements/Switch.tsx
diff --git a/packages/ui/elements/Table.js b/@packages/ui/elements/Table.js
similarity index 100%
rename from packages/ui/elements/Table.js
rename to @packages/ui/elements/Table.js
diff --git a/packages/ui/elements/Text.tsx b/@packages/ui/elements/Text.tsx
similarity index 100%
rename from packages/ui/elements/Text.tsx
rename to @packages/ui/elements/Text.tsx
diff --git a/packages/ui/elements/Tooltip.js b/@packages/ui/elements/Tooltip.js
similarity index 100%
rename from packages/ui/elements/Tooltip.js
rename to @packages/ui/elements/Tooltip.js
diff --git a/packages/ui/elements/config.js b/@packages/ui/elements/config.js
similarity index 100%
rename from packages/ui/elements/config.js
rename to @packages/ui/elements/config.js
diff --git a/packages/ui/elements/icons/DownloadOutlined.jsx b/@packages/ui/elements/icons/DownloadOutlined.jsx
similarity index 100%
rename from packages/ui/elements/icons/DownloadOutlined.jsx
rename to @packages/ui/elements/icons/DownloadOutlined.jsx
diff --git a/packages/ui/elements/index.ts b/@packages/ui/elements/index.ts
similarity index 100%
rename from packages/ui/elements/index.ts
rename to @packages/ui/elements/index.ts
diff --git a/packages/ui/elements/layout/Background.jsx b/@packages/ui/elements/layout/Background.jsx
similarity index 100%
rename from packages/ui/elements/layout/Background.jsx
rename to @packages/ui/elements/layout/Background.jsx
diff --git a/packages/ui/elements/layout/Divider.js b/@packages/ui/elements/layout/Divider.js
similarity index 100%
rename from packages/ui/elements/layout/Divider.js
rename to @packages/ui/elements/layout/Divider.js
diff --git a/packages/ui/elements/layout/Tabs.js b/@packages/ui/elements/layout/Tabs.js
similarity index 100%
rename from packages/ui/elements/layout/Tabs.js
rename to @packages/ui/elements/layout/Tabs.js
diff --git a/packages/ui/elements/message.js b/@packages/ui/elements/message.js
similarity index 100%
rename from packages/ui/elements/message.js
rename to @packages/ui/elements/message.js
diff --git a/packages/ui/elements/notification.ts b/@packages/ui/elements/notification.ts
similarity index 100%
rename from packages/ui/elements/notification.ts
rename to @packages/ui/elements/notification.ts
diff --git a/packages/ui/elements/styles/antd.less b/@packages/ui/elements/styles/antd.less
similarity index 100%
rename from packages/ui/elements/styles/antd.less
rename to @packages/ui/elements/styles/antd.less
diff --git a/packages/ui/elements/types.ts b/@packages/ui/elements/types.ts
similarity index 100%
rename from packages/ui/elements/types.ts
rename to @packages/ui/elements/types.ts
diff --git a/packages/ui/grid.ts b/@packages/ui/grid.ts
similarity index 100%
rename from packages/ui/grid.ts
rename to @packages/ui/grid.ts
diff --git a/packages/ui/mq.ts b/@packages/ui/mq.ts
similarity index 100%
rename from packages/ui/mq.ts
rename to @packages/ui/mq.ts
diff --git a/packages/ui/package.json b/@packages/ui/package.json
similarity index 100%
rename from packages/ui/package.json
rename to @packages/ui/package.json
diff --git a/packages/ui/theme.js b/@packages/ui/theme.js
similarity index 100%
rename from packages/ui/theme.js
rename to @packages/ui/theme.js
diff --git a/package.json b/package.json
index b9ee190..95cec93 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,9 @@
 {
-  "name": "evocalculator.client2",
-  "version": "0.1.0",
+  "name": "evocalculator.client",
+  "version": "2.0.0",
   "private": true,
   "workspaces": [
-    ".",
-    "packages/*"
+    "@packages/*"
   ],
   "scripts": {
     "dev": "next dev",
diff --git a/yarn.lock b/yarn.lock
index 3f6af66..75e5468 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6517,9 +6517,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"evocalculator.client2@workspace:.":
+"evocalculator.client@workspace:.":
   version: 0.0.0-use.local
-  resolution: "evocalculator.client2@workspace:."
+  resolution: "evocalculator.client@workspace:."
   dependencies:
     "@apollo/client": ^3.7.0
     "@fontsource/montserrat": ^4.5.12
@@ -13075,9 +13075,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tools@*, tools@workspace:packages/tools":
+"tools@*, tools@workspace:@packages/tools":
   version: 0.0.0-use.local
-  resolution: "tools@workspace:packages/tools"
+  resolution: "tools@workspace:@packages/tools"
   dependencies:
     mobx: ^6.7.0
     radash: ^10.3.0
@@ -13461,9 +13461,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ui@*, ui@workspace:packages/ui":
+"ui@*, ui@workspace:@packages/ui":
   version: 0.0.0-use.local
-  resolution: "ui@workspace:packages/ui"
+  resolution: "ui@workspace:@packages/ui"
   dependencies:
     "@ant-design/icons": ^4.8.0
     "@types/react": 18.0.20