diff --git a/packages/react-native-ui-lib/ios/Podfile.lock b/packages/react-native-ui-lib/ios/Podfile.lock
index fb24a2d2a4..223110e823 100644
--- a/packages/react-native-ui-lib/ios/Podfile.lock
+++ b/packages/react-native-ui-lib/ios/Podfile.lock
@@ -1638,7 +1638,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - ReactNativeUiLib (5.0.1):
+  - ReactNativeUiLib (5.1.0):
     - React
   - RNDateTimePicker (8.2.0):
     - DoubleConversion
@@ -2195,7 +2195,7 @@ SPEC CHECKSUMS:
   ReactCodegen: 7296600d988a22efad378aa9c06e930e0cc377c7
   ReactCommon: 7ea8ee50e489e9cc75922f19a06ea45c1b59b4bd
   ReactNativeNavigation: f5b64def1a53be435190591f9a4e1780167837e7
-  ReactNativeUiLib: 699cec778ce0464e2205c84f8716dd4d40bd9b4a
+  ReactNativeUiLib: 6a72903b74902f11cbb60cf885864191b3962a0a
   RNDateTimePicker: 8fcea61ffc2b8ee230ad29c7f423dc639359780c
   RNFlashList: b84542632250e04d25a4500294e32aa83d0e2e6f
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
diff --git a/packages/react-native-ui-lib/package.json b/packages/react-native-ui-lib/package.json
index 8a270c8a4b..bedc21dfef 100644
--- a/packages/react-native-ui-lib/package.json
+++ b/packages/react-native-ui-lib/package.json
@@ -101,7 +101,7 @@
         "setimmediate": "^1.0.5",
         "shell-utils": "^1.0.10",
         "typescript": "5.0.4",
-        "uilib-native": "5.1.0-snapshot.7635"
+        "uilib-native": "workspace:*"
     },
     "peerDependencies": {
         "react": ">=19.0.0",
diff --git a/packages/react-native-ui-lib/scripts/build/build.js b/packages/react-native-ui-lib/scripts/build/build.js
index 8d0094bd72..36334b87ed 100644
--- a/packages/react-native-ui-lib/scripts/build/build.js
+++ b/packages/react-native-ui-lib/scripts/build/build.js
@@ -1,12 +1,12 @@
 const childProcess = require('child_process');
 const fs = require('fs');
 
-const BABEL_OPTIONS = `--config-file ./scripts/build/.babelrc.json --extensions '.ts,.tsx' --ignore "src/**/*.d.ts,**/node_modules/**,lib/**/*.d.ts,../../lib/node_modules/**"`;
+const BABEL_OPTIONS = `--config-file ./scripts/build/.babelrc.json --extensions '.ts,.tsx' --ignore "src/**/*.d.ts,**/node_modules/**,lib/**/*.d.ts,../uilib-native/node_modules/**"`;
 const BABEL_INDEX_EXPORTS_OPTIONS = `--config-file ./scripts/build/.babelrc.exports.js`;
 
 console.info('## Start RNUILib Build ##');
 console.info('## Copy files from root ##');
-childProcess.execSync('cp -r ../../lib ./lib'); // TODO: pretty sure we don't need this - needs to be tested
+childProcess.execSync('cp -r ../uilib-native ./lib'); // TODO: pretty sure we don't need this - needs to be tested
 childProcess.execSync('cp -r ../../scripts .');
 childProcess.execSync('cp ../../README.md ./README.md');
 childProcess.execSync('cp ../../LICENSE ./LICENSE');
@@ -22,7 +22,7 @@ console.info('## Build lib (native component) files - convert TS to JS files ##'
 childProcess.execSync(`../../node_modules/.bin/babel lib --out-dir lib ${BABEL_OPTIONS}`);
 
 console.info('## in uilib-native - Build lib (native component) files - convert TS to JS files ##');
-childProcess.execSync(`../../node_modules/.bin/babel ../../lib --out-dir ../../lib ${BABEL_OPTIONS}`);
+childProcess.execSync(`../../node_modules/.bin/babel ../uilib-native --out-dir ../uilib-native ${BABEL_OPTIONS}`);
 
 console.info('## Build main index file - for lazy load exports ##');
 childProcess.execSync(`../../node_modules/.bin/babel ./src/index.js -o ./src/index.js ${BABEL_INDEX_EXPORTS_OPTIONS}`);
diff --git a/packages/react-native-ui-lib/scripts/release/release.js b/packages/react-native-ui-lib/scripts/release/release.js
index f768e9356e..543401a224 100644
--- a/packages/react-native-ui-lib/scripts/release/release.js
+++ b/packages/react-native-ui-lib/scripts/release/release.js
@@ -90,7 +90,7 @@ function tryPublishAndTag(version) {
 function tagAndPublish(newVersion) {
   console.log(`trying to publish ${newVersion}...`);
   exec.execSync(`npm --no-git-tag-version version ${newVersion}`);
-  exec.execSync(`npm publish --tag ${VERSION_TAG}`);
+  exec.execSync(`npm publish --tag ${VERSION_TAG} --workspace react-native-ui-lib`);
   if (isRelease) {
     exec.execSync(`git tag -a ${newVersion} -m "${newVersion}"`);
   }
diff --git a/lib/.npmignore b/packages/uilib-native/.npmignore
similarity index 100%
rename from lib/.npmignore
rename to packages/uilib-native/.npmignore
diff --git a/lib/ReactNativeUiLib.podspec b/packages/uilib-native/ReactNativeUiLib.podspec
similarity index 100%
rename from lib/ReactNativeUiLib.podspec
rename to packages/uilib-native/ReactNativeUiLib.podspec
diff --git a/lib/android/build.gradle b/packages/uilib-native/android/build.gradle
similarity index 100%
rename from lib/android/build.gradle
rename to packages/uilib-native/android/build.gradle
diff --git a/lib/android/src/main/AndroidManifest.xml b/packages/uilib-native/android/src/main/AndroidManifest.xml
similarity index 100%
rename from lib/android/src/main/AndroidManifest.xml
rename to packages/uilib-native/android/src/main/AndroidManifest.xml
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/UiLibPackageList.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/UiLibPackageList.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/UiLibPackageList.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/UiLibPackageList.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/dynamicfont/DynamicFontModule.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/dynamicfont/DynamicFontModule.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/dynamicfont/DynamicFontModule.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/dynamicfont/DynamicFontModule.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/dynamicfont/DynamicFontPackage.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/dynamicfont/DynamicFontPackage.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/dynamicfont/DynamicFontPackage.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/dynamicfont/DynamicFontPackage.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlightFrame.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlightFrame.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlightFrame.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlightFrame.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlightViewTagParams.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlightViewTagParams.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlightViewTagParams.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlightViewTagParams.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterView.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterView.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterView.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterView.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterViewManager.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterViewManager.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterViewManager.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterViewManager.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterViewPackage.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterViewPackage.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterViewPackage.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/HighlighterViewPackage.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/UiUtils.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/UiUtils.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/highlighterview/UiUtils.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/highlighterview/UiUtils.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/AppContextHolder.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/AppContextHolder.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/AppContextHolder.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/AppContextHolder.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardLayout.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardLayout.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardLayout.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardLayout.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootView.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootView.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootView.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootView.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootViewManager.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootViewManager.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootViewManager.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootViewManager.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootViewShadow.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootViewShadow.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootViewShadow.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/CustomKeyboardRootViewShadow.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/KeyboardInputModule.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/KeyboardInputModule.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/KeyboardInputModule.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/KeyboardInputModule.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/KeyboardInputPackage.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/KeyboardInputPackage.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/KeyboardInputPackage.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/KeyboardInputPackage.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactContextHolder.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactContextHolder.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactContextHolder.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactContextHolder.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactScreenMonitor.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactScreenMonitor.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactScreenMonitor.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactScreenMonitor.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactSoftKeyboardMonitor.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactSoftKeyboardMonitor.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactSoftKeyboardMonitor.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/ReactSoftKeyboardMonitor.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/PredicateFunc.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/PredicateFunc.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/PredicateFunc.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/PredicateFunc.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/RuntimeUtils.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/RuntimeUtils.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/RuntimeUtils.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/RuntimeUtils.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/ViewUtils.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/ViewUtils.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/ViewUtils.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/keyboardinput/utils/ViewUtils.java
diff --git a/lib/android/src/main/java/com/wix/reactnativeuilib/utils/LogForwarder.java b/packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/utils/LogForwarder.java
similarity index 100%
rename from lib/android/src/main/java/com/wix/reactnativeuilib/utils/LogForwarder.java
rename to packages/uilib-native/android/src/main/java/com/wix/reactnativeuilib/utils/LogForwarder.java
diff --git a/lib/android/src/main/res/layout/wheel_picker.xml b/packages/uilib-native/android/src/main/res/layout/wheel_picker.xml
similarity index 100%
rename from lib/android/src/main/res/layout/wheel_picker.xml
rename to packages/uilib-native/android/src/main/res/layout/wheel_picker.xml
diff --git a/lib/android/src/main/res/values/colors.xml b/packages/uilib-native/android/src/main/res/values/colors.xml
similarity index 100%
rename from lib/android/src/main/res/values/colors.xml
rename to packages/uilib-native/android/src/main/res/values/colors.xml
diff --git a/lib/android/src/main/res/values/styles.xml b/packages/uilib-native/android/src/main/res/values/styles.xml
similarity index 100%
rename from lib/android/src/main/res/values/styles.xml
rename to packages/uilib-native/android/src/main/res/values/styles.xml
diff --git a/lib/components/DynamicFonts/FontDownloader.ts b/packages/uilib-native/components/DynamicFonts/FontDownloader.ts
similarity index 100%
rename from lib/components/DynamicFonts/FontDownloader.ts
rename to packages/uilib-native/components/DynamicFonts/FontDownloader.ts
diff --git a/lib/components/DynamicFonts/FontLoader.ts b/packages/uilib-native/components/DynamicFonts/FontLoader.ts
similarity index 100%
rename from lib/components/DynamicFonts/FontLoader.ts
rename to packages/uilib-native/components/DynamicFonts/FontLoader.ts
diff --git a/lib/components/DynamicFonts/NoPermissionsAcquirer.ts b/packages/uilib-native/components/DynamicFonts/NoPermissionsAcquirer.ts
similarity index 100%
rename from lib/components/DynamicFonts/NoPermissionsAcquirer.ts
rename to packages/uilib-native/components/DynamicFonts/NoPermissionsAcquirer.ts
diff --git a/lib/components/DynamicFonts/PermissionsAcquirer.android.ts b/packages/uilib-native/components/DynamicFonts/PermissionsAcquirer.android.ts
similarity index 100%
rename from lib/components/DynamicFonts/PermissionsAcquirer.android.ts
rename to packages/uilib-native/components/DynamicFonts/PermissionsAcquirer.android.ts
diff --git a/lib/components/DynamicFonts/PermissionsAcquirer.ios.ts b/packages/uilib-native/components/DynamicFonts/PermissionsAcquirer.ios.ts
similarity index 100%
rename from lib/components/DynamicFonts/PermissionsAcquirer.ios.ts
rename to packages/uilib-native/components/DynamicFonts/PermissionsAcquirer.ios.ts
diff --git a/lib/components/DynamicFonts/PermissionsAcquirer.web.ts b/packages/uilib-native/components/DynamicFonts/PermissionsAcquirer.web.ts
similarity index 100%
rename from lib/components/DynamicFonts/PermissionsAcquirer.web.ts
rename to packages/uilib-native/components/DynamicFonts/PermissionsAcquirer.web.ts
diff --git a/lib/components/DynamicFonts/RNFSPackage.ts b/packages/uilib-native/components/DynamicFonts/RNFSPackage.ts
similarity index 100%
rename from lib/components/DynamicFonts/RNFSPackage.ts
rename to packages/uilib-native/components/DynamicFonts/RNFSPackage.ts
diff --git a/lib/components/DynamicFonts/index.ts b/packages/uilib-native/components/DynamicFonts/index.ts
similarity index 100%
rename from lib/components/DynamicFonts/index.ts
rename to packages/uilib-native/components/DynamicFonts/index.ts
diff --git a/lib/components/HighlighterOverlayView/index.tsx b/packages/uilib-native/components/HighlighterOverlayView/index.tsx
similarity index 100%
rename from lib/components/HighlighterOverlayView/index.tsx
rename to packages/uilib-native/components/HighlighterOverlayView/index.tsx
diff --git a/lib/components/HighlighterOverlayView/index.web.tsx b/packages/uilib-native/components/HighlighterOverlayView/index.web.tsx
similarity index 100%
rename from lib/components/HighlighterOverlayView/index.web.tsx
rename to packages/uilib-native/components/HighlighterOverlayView/index.web.tsx
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardView.android.tsx b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardView.android.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardView.android.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardView.android.tsx
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardView.ios.tsx b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardView.ios.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardView.ios.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardView.ios.tsx
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardViewBase.tsx b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardViewBase.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardViewBase.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/CustomKeyboardViewBase.tsx
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/index.tsx b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/index.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/index.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/index.tsx
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/index.web.tsx b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/index.web.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/index.web.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/CustomKeyboardView/index.web.tsx
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/EventEmitterManager/__tests__/EventEmitterManager.spec.js b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/EventEmitterManager/__tests__/EventEmitterManager.spec.js
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/EventEmitterManager/__tests__/EventEmitterManager.spec.js
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/EventEmitterManager/__tests__/EventEmitterManager.spec.js
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/EventEmitterManager/index.ts b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/EventEmitterManager/index.ts
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/EventEmitterManager/index.ts
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/EventEmitterManager/index.ts
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/__tests__/KeyboardRegistry.spec.js b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/__tests__/KeyboardRegistry.spec.js
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/__tests__/KeyboardRegistry.spec.js
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/__tests__/KeyboardRegistry.spec.js
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/index.ts b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/index.ts
similarity index 94%
rename from lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/index.ts
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/index.ts
index 4de878ac1b..ebba0a7081 100644
--- a/lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/index.ts
+++ b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/index.ts
@@ -32,6 +32,8 @@ export default class KeyboardRegistry {
    */
   static registerKeyboard = (componentID: string, generator: Function, params = {}) => {
     if (!_.isFunction(generator)) {
+      // TODO: do we want to add a util for this?
+      // eslint-disable-next-line no-restricted-syntax
       console.error(`KeyboardRegistry.registerKeyboard: ${componentID} you must register a generator function`);
       return;
     }
@@ -45,7 +47,9 @@ export default class KeyboardRegistry {
    */
   static getKeyboard = (componentID: string) => {
     const res = KeyboardRegistry.registeredKeyboards[componentID];
-    if (!res || !res.generator) {
+    if (!res?.generator) {
+      // TODO: do we want to add a util for this?
+      // eslint-disable-next-line no-restricted-syntax
       console.error(`KeyboardRegistry.getKeyboard: ${componentID} used but not yet registered`);
       return undefined;
     }
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/keyboardRegistry.api.json b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/keyboardRegistry.api.json
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/keyboardRegistry.api.json
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardRegistry/keyboardRegistry.api.json
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/KeyboardUtils/index.ts b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardUtils/index.ts
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/KeyboardUtils/index.ts
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/KeyboardUtils/index.ts
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/TextInputKeyboardManager.android.ts b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/TextInputKeyboardManager.android.ts
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/TextInputKeyboardManager.android.ts
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/TextInputKeyboardManager.android.ts
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/TextInputKeyboardManager.ios.ts b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/TextInputKeyboardManager.ios.ts
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/TextInputKeyboardManager.ios.ts
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/TextInputKeyboardManager.ios.ts
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/index.ts b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/index.ts
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/index.ts
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/TextInputKeyboardManager/index.ts
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/index.tsx b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/index.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/index.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/index.tsx
diff --git a/lib/components/Keyboard/KeyboardAccessoryView/keyboardAccessoryView.api.json b/packages/uilib-native/components/Keyboard/KeyboardAccessoryView/keyboardAccessoryView.api.json
similarity index 100%
rename from lib/components/Keyboard/KeyboardAccessoryView/keyboardAccessoryView.api.json
rename to packages/uilib-native/components/Keyboard/KeyboardAccessoryView/keyboardAccessoryView.api.json
diff --git a/lib/components/Keyboard/KeyboardAwareInsetsView/index.tsx b/packages/uilib-native/components/Keyboard/KeyboardAwareInsetsView/index.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardAwareInsetsView/index.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardAwareInsetsView/index.tsx
diff --git a/lib/components/Keyboard/KeyboardAwareInsetsView/keyboardAwareInsetsView.api.json b/packages/uilib-native/components/Keyboard/KeyboardAwareInsetsView/keyboardAwareInsetsView.api.json
similarity index 100%
rename from lib/components/Keyboard/KeyboardAwareInsetsView/keyboardAwareInsetsView.api.json
rename to packages/uilib-native/components/Keyboard/KeyboardAwareInsetsView/keyboardAwareInsetsView.api.json
diff --git a/lib/components/Keyboard/KeyboardTrackingView/KeyboardTrackingView.android.tsx b/packages/uilib-native/components/Keyboard/KeyboardTrackingView/KeyboardTrackingView.android.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardTrackingView/KeyboardTrackingView.android.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardTrackingView/KeyboardTrackingView.android.tsx
diff --git a/lib/components/Keyboard/KeyboardTrackingView/KeyboardTrackingView.ios.tsx b/packages/uilib-native/components/Keyboard/KeyboardTrackingView/KeyboardTrackingView.ios.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardTrackingView/KeyboardTrackingView.ios.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardTrackingView/KeyboardTrackingView.ios.tsx
diff --git a/lib/components/Keyboard/KeyboardTrackingView/index.tsx b/packages/uilib-native/components/Keyboard/KeyboardTrackingView/index.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardTrackingView/index.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardTrackingView/index.tsx
diff --git a/lib/components/Keyboard/KeyboardTrackingView/index.web.tsx b/packages/uilib-native/components/Keyboard/KeyboardTrackingView/index.web.tsx
similarity index 100%
rename from lib/components/Keyboard/KeyboardTrackingView/index.web.tsx
rename to packages/uilib-native/components/Keyboard/KeyboardTrackingView/index.web.tsx
diff --git a/lib/components/Keyboard/KeyboardTrackingView/keyboardTrackingView.api.json b/packages/uilib-native/components/Keyboard/KeyboardTrackingView/keyboardTrackingView.api.json
similarity index 100%
rename from lib/components/Keyboard/KeyboardTrackingView/keyboardTrackingView.api.json
rename to packages/uilib-native/components/Keyboard/KeyboardTrackingView/keyboardTrackingView.api.json
diff --git a/lib/components/Keyboard/index.ts b/packages/uilib-native/components/Keyboard/index.ts
similarity index 100%
rename from lib/components/Keyboard/index.ts
rename to packages/uilib-native/components/Keyboard/index.ts
diff --git a/lib/components/SafeArea/SafeAreaInsetsManager.ts b/packages/uilib-native/components/SafeArea/SafeAreaInsetsManager.ts
similarity index 100%
rename from lib/components/SafeArea/SafeAreaInsetsManager.ts
rename to packages/uilib-native/components/SafeArea/SafeAreaInsetsManager.ts
diff --git a/lib/components/SafeArea/SafeAreaSpacerView.tsx b/packages/uilib-native/components/SafeArea/SafeAreaSpacerView.tsx
similarity index 100%
rename from lib/components/SafeArea/SafeAreaSpacerView.tsx
rename to packages/uilib-native/components/SafeArea/SafeAreaSpacerView.tsx
diff --git a/lib/components/SafeArea/SafeAreaSpacerView.web.tsx b/packages/uilib-native/components/SafeArea/SafeAreaSpacerView.web.tsx
similarity index 100%
rename from lib/components/SafeArea/SafeAreaSpacerView.web.tsx
rename to packages/uilib-native/components/SafeArea/SafeAreaSpacerView.web.tsx
diff --git a/lib/components/SafeArea/__tests__/SafeAreaInsetsManager.spec.js b/packages/uilib-native/components/SafeArea/__tests__/SafeAreaInsetsManager.spec.js
similarity index 100%
rename from lib/components/SafeArea/__tests__/SafeAreaInsetsManager.spec.js
rename to packages/uilib-native/components/SafeArea/__tests__/SafeAreaInsetsManager.spec.js
diff --git a/lib/components/SafeArea/index.tsx b/packages/uilib-native/components/SafeArea/index.tsx
similarity index 100%
rename from lib/components/SafeArea/index.tsx
rename to packages/uilib-native/components/SafeArea/index.tsx
diff --git a/lib/components/index.ts b/packages/uilib-native/components/index.ts
similarity index 100%
rename from lib/components/index.ts
rename to packages/uilib-native/components/index.ts
diff --git a/lib/ios/reactnativeuilib.xcodeproj/project.pbxproj b/packages/uilib-native/ios/reactnativeuilib.xcodeproj/project.pbxproj
similarity index 100%
rename from lib/ios/reactnativeuilib.xcodeproj/project.pbxproj
rename to packages/uilib-native/ios/reactnativeuilib.xcodeproj/project.pbxproj
diff --git a/lib/ios/reactnativeuilib/dynamicfont/DynamicFont.h b/packages/uilib-native/ios/reactnativeuilib/dynamicfont/DynamicFont.h
similarity index 100%
rename from lib/ios/reactnativeuilib/dynamicfont/DynamicFont.h
rename to packages/uilib-native/ios/reactnativeuilib/dynamicfont/DynamicFont.h
diff --git a/lib/ios/reactnativeuilib/dynamicfont/DynamicFont.m b/packages/uilib-native/ios/reactnativeuilib/dynamicfont/DynamicFont.m
similarity index 100%
rename from lib/ios/reactnativeuilib/dynamicfont/DynamicFont.m
rename to packages/uilib-native/ios/reactnativeuilib/dynamicfont/DynamicFont.m
diff --git a/lib/ios/reactnativeuilib/highlighterview/HighlighterView.h b/packages/uilib-native/ios/reactnativeuilib/highlighterview/HighlighterView.h
similarity index 100%
rename from lib/ios/reactnativeuilib/highlighterview/HighlighterView.h
rename to packages/uilib-native/ios/reactnativeuilib/highlighterview/HighlighterView.h
diff --git a/lib/ios/reactnativeuilib/highlighterview/HighlighterView.m b/packages/uilib-native/ios/reactnativeuilib/highlighterview/HighlighterView.m
similarity index 100%
rename from lib/ios/reactnativeuilib/highlighterview/HighlighterView.m
rename to packages/uilib-native/ios/reactnativeuilib/highlighterview/HighlighterView.m
diff --git a/lib/ios/reactnativeuilib/highlighterview/HighlighterViewManager.h b/packages/uilib-native/ios/reactnativeuilib/highlighterview/HighlighterViewManager.h
similarity index 100%
rename from lib/ios/reactnativeuilib/highlighterview/HighlighterViewManager.h
rename to packages/uilib-native/ios/reactnativeuilib/highlighterview/HighlighterViewManager.h
diff --git a/lib/ios/reactnativeuilib/highlighterview/HighlighterViewManager.m b/packages/uilib-native/ios/reactnativeuilib/highlighterview/HighlighterViewManager.m
similarity index 100%
rename from lib/ios/reactnativeuilib/highlighterview/HighlighterViewManager.m
rename to packages/uilib-native/ios/reactnativeuilib/highlighterview/HighlighterViewManager.m
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/Color+Interpolation.h b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/Color+Interpolation.h
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/lninterpolation/Color+Interpolation.h
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/Color+Interpolation.h
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/Color+Interpolation.m b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/Color+Interpolation.m
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/lninterpolation/Color+Interpolation.m
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/Color+Interpolation.m
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimatorTemp.h b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimatorTemp.h
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimatorTemp.h
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimatorTemp.h
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimatorTemp.m b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimatorTemp.m
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimatorTemp.m
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimatorTemp.m
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolable.h b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolable.h
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolable.h
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolable.h
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolable.m b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolable.m
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolable.m
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolable.m
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolation.h b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolation.h
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolation.h
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/LNInterpolation.h
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/NSValue+Interpolation.h b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/NSValue+Interpolation.h
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/lninterpolation/NSValue+Interpolation.h
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/NSValue+Interpolation.h
diff --git a/lib/ios/reactnativeuilib/keyboardinput/lninterpolation/NSValue+Interpolation.mm b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/NSValue+Interpolation.mm
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/lninterpolation/NSValue+Interpolation.mm
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/lninterpolation/NSValue+Interpolation.mm
diff --git a/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.h b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.h
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.h
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.h
diff --git a/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.m b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.m
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.m
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.m
diff --git a/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.h b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.h
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.h
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.h
diff --git a/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.m b/packages/uilib-native/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.m
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.m
rename to packages/uilib-native/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.m
diff --git a/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.h b/packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.h
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.h
rename to packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.h
diff --git a/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m b/packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m
rename to packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m
diff --git a/lib/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.h b/packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.h
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.h
rename to packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.h
diff --git a/lib/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.m b/packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.m
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.m
rename to packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/ObservingInputAccessoryViewTemp.m
diff --git a/lib/ios/reactnativeuilib/keyboardtrackingview/UIResponder+FirstResponderTemp.h b/packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/UIResponder+FirstResponderTemp.h
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardtrackingview/UIResponder+FirstResponderTemp.h
rename to packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/UIResponder+FirstResponderTemp.h
diff --git a/lib/ios/reactnativeuilib/keyboardtrackingview/UIResponder+FirstResponderTemp.m b/packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/UIResponder+FirstResponderTemp.m
similarity index 100%
rename from lib/ios/reactnativeuilib/keyboardtrackingview/UIResponder+FirstResponderTemp.m
rename to packages/uilib-native/ios/reactnativeuilib/keyboardtrackingview/UIResponder+FirstResponderTemp.m
diff --git a/lib/ios/reactnativeuilib/safearea/SafeAreaManager.h b/packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaManager.h
similarity index 100%
rename from lib/ios/reactnativeuilib/safearea/SafeAreaManager.h
rename to packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaManager.h
diff --git a/lib/ios/reactnativeuilib/safearea/SafeAreaManager.m b/packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaManager.m
similarity index 100%
rename from lib/ios/reactnativeuilib/safearea/SafeAreaManager.m
rename to packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaManager.m
diff --git a/lib/ios/reactnativeuilib/safearea/SafeAreaSpacerShadowView.h b/packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerShadowView.h
similarity index 100%
rename from lib/ios/reactnativeuilib/safearea/SafeAreaSpacerShadowView.h
rename to packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerShadowView.h
diff --git a/lib/ios/reactnativeuilib/safearea/SafeAreaSpacerShadowView.m b/packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerShadowView.m
similarity index 100%
rename from lib/ios/reactnativeuilib/safearea/SafeAreaSpacerShadowView.m
rename to packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerShadowView.m
diff --git a/lib/ios/reactnativeuilib/safearea/SafeAreaSpacerView.h b/packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerView.h
similarity index 100%
rename from lib/ios/reactnativeuilib/safearea/SafeAreaSpacerView.h
rename to packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerView.h
diff --git a/lib/ios/reactnativeuilib/safearea/SafeAreaSpacerView.m b/packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerView.m
similarity index 100%
rename from lib/ios/reactnativeuilib/safearea/SafeAreaSpacerView.m
rename to packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerView.m
diff --git a/lib/ios/reactnativeuilib/safearea/SafeAreaSpacerViewLocalData.h b/packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerViewLocalData.h
similarity index 100%
rename from lib/ios/reactnativeuilib/safearea/SafeAreaSpacerViewLocalData.h
rename to packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerViewLocalData.h
diff --git a/lib/ios/reactnativeuilib/safearea/SafeAreaSpacerViewLocalData.m b/packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerViewLocalData.m
similarity index 100%
rename from lib/ios/reactnativeuilib/safearea/SafeAreaSpacerViewLocalData.m
rename to packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerViewLocalData.m
diff --git a/lib/ios/reactnativeuilib/safearea/SafeAreaSpacerViewManager.h b/packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerViewManager.h
similarity index 100%
rename from lib/ios/reactnativeuilib/safearea/SafeAreaSpacerViewManager.h
rename to packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerViewManager.h
diff --git a/lib/ios/reactnativeuilib/safearea/SafeAreaSpacerViewManager.m b/packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerViewManager.m
similarity index 100%
rename from lib/ios/reactnativeuilib/safearea/SafeAreaSpacerViewManager.m
rename to packages/uilib-native/ios/reactnativeuilib/safearea/SafeAreaSpacerViewManager.m
diff --git a/lib/package.json b/packages/uilib-native/package.json
similarity index 100%
rename from lib/package.json
rename to packages/uilib-native/package.json
diff --git a/lib/react-native.config.js b/packages/uilib-native/react-native.config.js
similarity index 92%
rename from lib/react-native.config.js
rename to packages/uilib-native/react-native.config.js
index f8d9905656..955d9dea09 100644
--- a/lib/react-native.config.js
+++ b/packages/uilib-native/react-native.config.js
@@ -4,7 +4,7 @@ module.exports = {
       /* TODO: Once we upgrade to RN69 we should try using podspecPath again, for now I copied ReactNativeUiLib.podspec file to the root - it seems to work
       I copied it, because we need it for both the main uilib and the uilib-native package */
       // ios: {
-      //   podspecPath: './lib/ReactNativeUiLib.podspec'
+      //   podspecPath: './uilib-native/ReactNativeUiLib.podspec'
       // },
       android: {
         sourceDir: './android/',
diff --git a/lib/scripts/.npmrc b/packages/uilib-native/scripts/.npmrc
similarity index 100%
rename from lib/scripts/.npmrc
rename to packages/uilib-native/scripts/.npmrc
diff --git a/lib/scripts/releaseNative.js b/packages/uilib-native/scripts/releaseNative.js
similarity index 96%
rename from lib/scripts/releaseNative.js
rename to packages/uilib-native/scripts/releaseNative.js
index e0110ccf82..f41b669071 100644
--- a/lib/scripts/releaseNative.js
+++ b/packages/uilib-native/scripts/releaseNative.js
@@ -62,7 +62,7 @@ function tagAndPublish(newVersion) {
   if (IS_SNAPSHOT) {
     exec.execSync(`npm --no-git-tag-version version ${newVersion}`);
   }
-  exec.execSync(`npm publish --tag ${VERSION_TAG}`);
+  exec.execSync(`npm publish --tag ${VERSION_TAG} --workspace uilib-native`);
   if (!IS_SNAPSHOT) {
     exec.execSync(`git tag -a ${newVersion} -m "${newVersion}"`);
   }
diff --git a/lib/specs/HighlighterViewNativeComponent.ts b/packages/uilib-native/specs/HighlighterViewNativeComponent.ts
similarity index 100%
rename from lib/specs/HighlighterViewNativeComponent.ts
rename to packages/uilib-native/specs/HighlighterViewNativeComponent.ts
diff --git a/lib/specs/KeyboardTrackingViewNativeComponent.ts b/packages/uilib-native/specs/KeyboardTrackingViewNativeComponent.ts
similarity index 100%
rename from lib/specs/KeyboardTrackingViewNativeComponent.ts
rename to packages/uilib-native/specs/KeyboardTrackingViewNativeComponent.ts
diff --git a/scripts/docs/buildDocs.js b/scripts/docs/buildDocs.js
index 84c8271a0b..3e9481333e 100644
--- a/scripts/docs/buildDocs.js
+++ b/scripts/docs/buildDocs.js
@@ -1 +1 @@
-require('./buildDocsCommon').buildDocs('./packages/react-native-ui-lib/src ./lib/components');
+require('./buildDocsCommon').buildDocs('./packages/react-native-ui-lib/src ./packages/uilib-native/components');
diff --git a/scripts/release/releaseNative.sh b/scripts/release/releaseNative.sh
index be2f5bbd5f..63174e6c32 100755
--- a/scripts/release/releaseNative.sh
+++ b/scripts/release/releaseNative.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-pushd lib
+pushd packages/uilib-native
 npm install
 npm run releaseNative
 popd
diff --git a/yarn.lock b/yarn.lock
index d4b4987db0..96675b3095 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9733,7 +9733,7 @@ __metadata:
     shell-utils: "npm:^1.0.10"
     tinycolor2: "npm:^1.4.2"
     typescript: "npm:5.0.4"
-    uilib-native: "npm:5.1.0-snapshot.7635"
+    uilib-native: "workspace:*"
     url-parse: "npm:^1.2.0"
     wix-react-native-text-size: "npm:1.0.9"
   peerDependencies:
@@ -11285,17 +11285,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uilib-native@npm:5.1.0-snapshot.7635":
-  version: 5.1.0-snapshot.7635
-  resolution: "uilib-native@npm:5.1.0-snapshot.7635"
+"uilib-native@workspace:*, uilib-native@workspace:packages/uilib-native":
+  version: 0.0.0-use.local
+  resolution: "uilib-native@workspace:packages/uilib-native"
   dependencies:
     lodash: "npm:^4.17.21"
+    shell-utils: "npm:^1.0.10"
   peerDependencies:
     react: ">=19.0.0"
     react-native: ">=0.78.3"
-  checksum: 10c0/f98238f78e3c291cda5111459dc08d3acddbf38f37f2febb6e7743f0c663c47ab9e0cb9e2558dd044710365640b6c52ada47aec925dfee1386b05fd34e7becad
-  languageName: node
-  linkType: hard
+  languageName: unknown
+  linkType: soft
 
 "unbox-primitive@npm:^1.0.2":
   version: 1.0.2