diff --git a/.gitignore b/.gitignore
index 28f1ba7..ffc0011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-.DS_Store
\ No newline at end of file
+.DS_Store
+sasjsbuild/
diff --git a/package-lock.json b/package-lock.json
index 81a8694..2daab49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,4 +1,28 @@
 {
-  "name": "macrocore",
-  "lockfileVersion": 1
+  "name": "@sasjs/core",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@sasjs/core",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@sasjs/core": "^2.2.1"
+      }
+    },
+    "node_modules/@sasjs/core": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-2.2.1.tgz",
+      "integrity": "sha512-CLICF0+ZUorKXct+4eU4ij1D5JCt4FZLwIyrUmfIA55XZJZxerS8pffh8BvXNi0x8MvtfKM12MCrpbtWTaX+Mw=="
+    }
+  },
+  "dependencies": {
+    "@sasjs/core": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-2.2.1.tgz",
+      "integrity": "sha512-CLICF0+ZUorKXct+4eU4ij1D5JCt4FZLwIyrUmfIA55XZJZxerS8pffh8BvXNi0x8MvtfKM12MCrpbtWTaX+Mw=="
+    }
+  }
 }
diff --git a/package.json b/package.json
index 043c488..3d20a11 100644
--- a/package.json
+++ b/package.json
@@ -10,13 +10,25 @@
   "author": "Allan Bowe <support@macropeople.com>",
   "repository": {
     "type": "git",
-    "url": "https://github.com/sasjs/core"
+    "url": "git+https://github.com/sasjs/core.git"
   },
   "release": {
-    "branches": ["main"]
+    "branches": [
+      "main"
+    ]
   },
   "publishConfig": {
     "access": "public"
   },
-  "devDependencies": {}
+  "bugs": {
+    "url": "https://github.com/sasjs/core/issues"
+  },
+  "homepage": "https://github.com/sasjs/core#readme",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "dependencies": {
+  }
 }
diff --git a/doxy/Doxyfile b/sasjs/doxy/Doxyfile
similarity index 100%
rename from doxy/Doxyfile
rename to sasjs/doxy/Doxyfile
diff --git a/doxy/DoxygenLayout.xml b/sasjs/doxy/DoxygenLayout.xml
similarity index 100%
rename from doxy/DoxygenLayout.xml
rename to sasjs/doxy/DoxygenLayout.xml
diff --git a/doxy/Macro_core_website_1.png b/sasjs/doxy/Macro_core_website_1.png
similarity index 100%
rename from doxy/Macro_core_website_1.png
rename to sasjs/doxy/Macro_core_website_1.png
diff --git a/doxy/batch.bat b/sasjs/doxy/batch.bat
similarity index 100%
rename from doxy/batch.bat
rename to sasjs/doxy/batch.bat
diff --git a/doxy/build.sh b/sasjs/doxy/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from doxy/build.sh
rename to sasjs/doxy/build.sh
diff --git a/doxy/favicon.ico b/sasjs/doxy/favicon.ico
similarity index 100%
rename from doxy/favicon.ico
rename to sasjs/doxy/favicon.ico
diff --git a/doxy/new_footer.html b/sasjs/doxy/new_footer.html
similarity index 97%
rename from doxy/new_footer.html
rename to sasjs/doxy/new_footer.html
index a7ed013..6691201 100644
--- a/doxy/new_footer.html
+++ b/sasjs/doxy/new_footer.html
@@ -1,23 +1,23 @@
-<!-- HTML footer for doxygen 1.8.17-->
-<!-- start footer part -->
-<!--BEGIN GENERATE_TREEVIEW-->
-<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
-  <ul>
-    $navpath
-    <li class="footer">$generatedby
-    <a href="https://www.doxygen.org/index.html">
-      <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li>
-   <i> For more information visit the </i> <a href="https://github.com/sasjs/core">Macro Core library</a>.</li>
-
-   </ul>
- </div>
-<!--END GENERATE_TREEVIEW-->
-<!--BEGIN !GENERATE_TREEVIEW-->
-<hr class="footer"/><address class="footer"><small>
-  $generatedby &#160;<a href="http://www.doxygen.org/index.html">
-  <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
-  </a> $doxygenversion
-  </small></address>
-<!--END !GENERATE_TREEVIEW-->
-</body>
-</html>
+<!-- HTML footer for doxygen 1.8.17-->
+<!-- start footer part -->
+<!--BEGIN GENERATE_TREEVIEW-->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    $navpath
+    <li class="footer">$generatedby
+    <a href="https://www.doxygen.org/index.html">
+      <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li>
+   <i> For more information visit the </i> <a href="https://github.com/sasjs/core">Macro Core library</a>.</li>
+
+   </ul>
+ </div>
+<!--END GENERATE_TREEVIEW-->
+<!--BEGIN !GENERATE_TREEVIEW-->
+<hr class="footer"/><address class="footer"><small>
+  $generatedby &#160;<a href="http://www.doxygen.org/index.html">
+  <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
+  </a> $doxygenversion
+  </small></address>
+<!--END !GENERATE_TREEVIEW-->
+</body>
+</html>
diff --git a/doxy/new_header.html b/sasjs/doxy/new_header.html
similarity index 97%
rename from doxy/new_header.html
rename to sasjs/doxy/new_header.html
index 8c9128d..e51c194 100644
--- a/doxy/new_header.html
+++ b/sasjs/doxy/new_header.html
@@ -1,72 +1,72 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- HTML header for doxygen 1.8.17-->
-<html xmlns="https://www.w3.org/1999/xhtml" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen $doxygenversion"/>
-<meta name="viewport" content="width=device-width, initial-scale=1"/>
-<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
-<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
-<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath^jquery.js"></script>
-<script type="text/javascript" src="$relpath^dynsections.js"></script>
-$treeview
-$search
-$mathjax
-<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
-<link REL="icon" HREF="https://sasjs.io/img/runningman.jpg">
-$extrastylesheet
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-
-<!--BEGIN TITLEAREA-->
-<div id="titlearea">
-<table cellspacing="0" cellpadding="0">
- <tbody>
-  <tr style="height: 56px;">
-  <!--BEGIN PROJECT_LOGO-->
-  <td id="projectlogo">
-    <img alt="Logo" src="$relpath^$projectlogo"/></td>
-  <!--END PROJECT_LOGO-->
-<!--BEGIN PROJECT_NAME-->
-<td id="projectalign" style="padding-left: 0.5em;">
-  <div id="projectname">
-   <!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER-->
-   </div>
-   <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">
-    Production Ready Macros for SAS Application Developers</br>
-    <a href="https://github.com/sasjs/core">
-        https://github.com/sasjs/core
-    </a>
-
-   </div>
-   <meta name="Description" content="$projectbrief">
-   <!--END PROJECT_BRIEF-->
-  </td>
-  <!--END PROJECT_NAME-->
-  <!--BEGIN !PROJECT_NAME-->
-   <!--BEGIN PROJECT_BRIEF-->
-   <td style="padding-left: 0.5em;">
-    <div id="projectbrief">$projectbrief</div>
-    <table style="padding-left: 2em;" cellspacing="0" cellpadding="0">
-      <tr><td> Production Ready Macros for SAS Application Developers</td></tr>
-      <tr><td><a href="https://github.com/sasjs/core">
-          https://github.com/sasjs/core
-      </a></td></tr>
-    </table>
-    </td>
-   <!--END PROJECT_BRIEF-->
-  <!--END !PROJECT_NAME-->
-  <!--BEGIN DISABLE_INDEX-->
-   <!--BEGIN SEARCHENGINE-->
-   <td>$searchbox</td>
-   <!--END SEARCHENGINE-->
-  <!--END DISABLE_INDEX-->
- </tr>
- </tbody>
-</table>
-</div>
-<!--END TITLEAREA-->
-<!-- end header part -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- HTML header for doxygen 1.8.17-->
+<html xmlns="https://www.w3.org/1999/xhtml" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen $doxygenversion"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
+<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
+<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="$relpath^jquery.js"></script>
+<script type="text/javascript" src="$relpath^dynsections.js"></script>
+$treeview
+$search
+$mathjax
+<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
+<link REL="icon" HREF="https://sasjs.io/img/runningman.jpg">
+$extrastylesheet
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+
+<!--BEGIN TITLEAREA-->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+  <tr style="height: 56px;">
+  <!--BEGIN PROJECT_LOGO-->
+  <td id="projectlogo">
+    <img alt="Logo" src="$relpath^$projectlogo"/></td>
+  <!--END PROJECT_LOGO-->
+<!--BEGIN PROJECT_NAME-->
+<td id="projectalign" style="padding-left: 0.5em;">
+  <div id="projectname">
+   <!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER-->
+   </div>
+   <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">
+    Production Ready Macros for SAS Application Developers</br>
+    <a href="https://github.com/sasjs/core">
+        https://github.com/sasjs/core
+    </a>
+
+   </div>
+   <meta name="Description" content="$projectbrief">
+   <!--END PROJECT_BRIEF-->
+  </td>
+  <!--END PROJECT_NAME-->
+  <!--BEGIN !PROJECT_NAME-->
+   <!--BEGIN PROJECT_BRIEF-->
+   <td style="padding-left: 0.5em;">
+    <div id="projectbrief">$projectbrief</div>
+    <table style="padding-left: 2em;" cellspacing="0" cellpadding="0">
+      <tr><td> Production Ready Macros for SAS Application Developers</td></tr>
+      <tr><td><a href="https://github.com/sasjs/core">
+          https://github.com/sasjs/core
+      </a></td></tr>
+    </table>
+    </td>
+   <!--END PROJECT_BRIEF-->
+  <!--END !PROJECT_NAME-->
+  <!--BEGIN DISABLE_INDEX-->
+   <!--BEGIN SEARCHENGINE-->
+   <td>$searchbox</td>
+   <!--END SEARCHENGINE-->
+  <!--END DISABLE_INDEX-->
+ </tr>
+ </tbody>
+</table>
+</div>
+<!--END TITLEAREA-->
+<!-- end header part -->
diff --git a/doxy/new_stylesheet.css b/sasjs/doxy/new_stylesheet.css
similarity index 91%
rename from doxy/new_stylesheet.css
rename to sasjs/doxy/new_stylesheet.css
index aecd28c..41958a7 100644
--- a/doxy/new_stylesheet.css
+++ b/sasjs/doxy/new_stylesheet.css
@@ -1,5 +1,5 @@
-#projectlogo img
-{
-	border: 0px none;
-	max-height:70px
+#projectlogo img
+{
+	border: 0px none;
+	max-height:70px
 }
\ No newline at end of file
diff --git a/doxy/runningman.jpg b/sasjs/doxy/runningman.jpg
similarity index 100%
rename from doxy/runningman.jpg
rename to sasjs/doxy/runningman.jpg
diff --git a/sasjs/sasjsconfig.json b/sasjs/sasjsconfig.json
new file mode 100644
index 0000000..097ebce
--- /dev/null
+++ b/sasjs/sasjsconfig.json
@@ -0,0 +1,6 @@
+{
+ "macroFolders": [
+  "../base","../meta","../metax","../viya"
+ ],
+ "useMacroCore": false
+}
\ No newline at end of file