diff --git a/lerna.json b/lerna.json
index 0c37057d..ad95c037 100644
--- a/lerna.json
+++ b/lerna.json
@@ -13,7 +13,8 @@
   "packages": [
     "packages/eslint-plugin-pf-codemods",
     "packages/pf-codemods",
-    "packages/class-name-updater"
+    "packages/class-name-updater",
+    "packages/css-vars-updater"
   ],
   "version": "independent"
 }
diff --git a/package.json b/package.json
index 1deaa3a7..04faec3b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "test": "yarn test:v4 && yarn test:v5 && yarn test:v6",
     "test:v4": "mocha packages/eslint-plugin-pf-codemods/test/rules/v4",
     "test:v5": "mocha packages/eslint-plugin-pf-codemods/test/rules/v5",
-    "test:v6": "yarn build && mocha packages/eslint-plugin-pf-codemods/dist/js/rules/v6/*/*.test.js",
+    "test:v6": "yarn build && mocha packages/eslint-plugin-pf-codemods/dist/js/packages/eslint-plugin-pf-codemods/src/rules/v6/*/*.test.js",
     "test:v4:single": "pf-codemods --v4 --no-cache test/v4test.tsx",
     "test:v5:single": "pf-codemods --no-cache test/test.tsx",
     "test:v6:single": "yarn build && pf-codemods --v6 --no-cache packages/eslint-plugin-pf-codemods/src/rules/v6/*/*Input.tsx",
@@ -38,8 +38,7 @@
   },
   "homepage": "https://github.com/patternfly/pf-codemods#readme",
   "workspaces": [
-    "packages/*",
-    "tokenLists"
+    "packages/*"
   ],
   "devDependencies": {
     "lerna": "^3.22.0",
diff --git a/packages/class-name-updater/package.json b/packages/class-name-updater/package.json
index 4dcbe8cd..782bd77f 100644
--- a/packages/class-name-updater/package.json
+++ b/packages/class-name-updater/package.json
@@ -5,7 +5,7 @@
   "author": "Red Hat",
   "license": "MIT",
   "bin": {
-    "class-name-updater": "./dist/cli.js"
+    "class-name-updater": "./dist/packages/class-name-updater/src/cli.js"
   },
   "engines": {
     "node": ">=18"
@@ -17,8 +17,8 @@
     "build": "tsc --build --verbose ./tsconfig.json",
     "clean": "rimraf ./dist",
     "test": "yarn build && yarn test:v5 && yarn test:v6",
-    "test:v5": "node ./dist/cli.js test --exclude test/largeFile.js",
-    "test:v6": "node ./dist/cli.js test --exclude test/largeFile.js --v6"
+    "test:v5": "node ./dist/packages/class-name-updater/src/cli.js test --exclude test/largeFile.js",
+    "test:v6": "node ./dist/packages/class-name-updater/src/cli.js test --exclude test/largeFile.js --v6"
   },
   "dependencies": {
     "colors": "^1.4.0",
diff --git a/packages/class-name-updater/src/cli.ts b/packages/class-name-updater/src/cli.ts
index 2caea9bd..09639803 100755
--- a/packages/class-name-updater/src/cli.ts
+++ b/packages/class-name-updater/src/cli.ts
@@ -8,7 +8,7 @@ import { classNameUpdate } from "./classNameUpdate";
 
 program
   .version(
-    require('../package.json').version
+    require('../../../../package.json').version
   )
   .description("Update class name versioning")
   .arguments("<path> [otherPaths...]")
diff --git a/packages/css-vars-updater/package.json b/packages/css-vars-updater/package.json
index a954c8b4..6e4f9203 100644
--- a/packages/css-vars-updater/package.json
+++ b/packages/css-vars-updater/package.json
@@ -5,7 +5,7 @@
   "author": "Red Hat",
   "license": "MIT",
   "bin": {
-    "css-vars-updater": "./dist/cli.js"
+    "css-vars-updater": "./dist/packages/css-vars-updater/src/cli.js"
   },
   "engines": {
     "node": ">=18"