diff --git a/README.md b/README.md
index fecedad..e36528b 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Much quality. Many standards. The **Macro Core** library exists to save time and
 You can download and compile them all in just two lines of SAS code:
 
 ```sas
-filename mc url "https://raw.githubusercontent.com/sasjs/core/master/mc_all.sas";
+filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc;
 ```
 
@@ -54,7 +54,7 @@ The above can be done directly in your sas program, via an autoexec, or an initi
 Alternatively - for quick access - simply run the following! This file contains all the macros.
 
 ```sas
-filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc;
 ```
 
diff --git a/mc_all.sas b/all.sas
similarity index 99%
rename from mc_all.sas
rename to all.sas
index f90fa06..5202360 100644
--- a/mc_all.sas
+++ b/all.sas
@@ -7,10 +7,10 @@
     'included' in SAS with just 2 lines of code:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
-    The `build.py` file in the https://github.com/macropeople/macrocore repo
+    The `build.py` file in the https://github.com/sasjs/core repo
     is used to create this file.
 
   @author Allan Bowe
@@ -497,7 +497,7 @@ options noquotelenmax;
 %end;
 %else %put %str(ERR)OR: Unable to find key &key in ds &libds;
 %mend;/**
-  @file mf_getplatform
+  @file mf_getplatform.sas
   @brief Returns platform specific variables
   @details Enables platform specific variables to be returned
 
@@ -1765,7 +1765,7 @@ run;
 Usage:
 
     %* compile macros ;
-    filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
     %inc mc;
 
     %* write some code;
@@ -2311,7 +2311,7 @@ data _null_;
     put '/*******************************************************************';
     put " Datalines for %upcase(%scan(&base_ds,2)) dataset ";
     put " Generated by %nrstr(%%)mp_ds2cards()";
-    put " Available on github.com/macropeople/macrocore";
+    put " Available on github.com/sasjs/core";
     put '********************************************************************/';
     put "data &tgt_ds &indexes;";
     put "attrib ";
@@ -2465,7 +2465,7 @@ create table &outds as
 
   @version 9.3
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -2748,7 +2748,7 @@ create table &outds (rename=(
 
   Usage:
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
       %mp_guesspk(sashelp.class,outds=classpks)
 
@@ -3062,7 +3062,8 @@ create table &outds (rename=(
         run;
 
   If you are building web apps with SAS then you are strongly encouraged to use
-  the mX_createwebservice macros in combination with [sasjs](https://github.com/macropeople/sasjs).
+  the mX_createwebservice macros in combination with the 
+  [sasjs adapter](https://github.com/sasjs/adapter).
   For more information see https://sasjs.io
 
   @param action Valid values:
@@ -3083,7 +3084,7 @@ create table &outds (rename=(
 
   @version 9.2
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -3268,7 +3269,7 @@ select distinct lowcase(memname)
 
   @version 9.2
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -3451,7 +3452,7 @@ run;
 
   @version 9.3
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -3657,7 +3658,7 @@ proc sql
 
   @version 9.2
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -3719,7 +3720,7 @@ proc sql
 
   @version 9.2
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -3769,7 +3770,7 @@ proc sql
 
   Usage:
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %mp_streamfile(contenttype=csv,inloc=/some/where.txt,outname=myfile.txt)
@@ -3783,7 +3784,7 @@ proc sql
   @param outname= the name of the file, as downloaded by the browser
 
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -3870,7 +3871,7 @@ proc sql
 
     Usage:
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %mp_unzip(ziploc="/some/file.zip",outdir=/some/folder)
@@ -3884,7 +3885,7 @@ proc sql
 
   @version 9.4
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -4044,7 +4045,7 @@ alter table &libds modify &var char(&len);
 
   @version 9.2
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -5949,12 +5950,12 @@ run;
 %mend;/**
   @file mm_createwebservice.sas
   @brief Create a Web Ready Stored Process
-  @details This macro creates a Type 2 Stored Process with the macropeople
-            mm_webout macro included as pre-code.
+  @details This macro creates a Type 2 Stored Process with the mm_webout macro
+    included as pre-code.
 Usage:
 
     %* compile macros ;
-    filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
     %inc mc;
 
     %* parmcards lets us write to a text file from open code ;
@@ -8289,13 +8290,14 @@ libname _XML_ clear;
 /**
   @file
   @brief Retrieves properties of the SAS web app server
-  @description usage:
+  @details 
+  Usage:
 
-    %mm_getwebappsrvprops(outds= some_ds)
-    data _null_;
-      set some_ds(where=(name='webappsrv.server.url'));
-      put value=;
-    run;
+      %mm_getwebappsrvprops(outds= some_ds)
+      data _null_;
+        set some_ds(where=(name='webappsrv.server.url'));
+        put value=;
+      run;
 
   @param outds the dataset to create that contains the list of properties
 
@@ -8309,7 +8311,7 @@ libname _XML_ clear;
 
   @version 9.4
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -8433,7 +8435,7 @@ filename __shake clear;
   Usage:
 
       %* import the macros (or make them available some other way);
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %* create sample text file as input to the macro;
@@ -8555,7 +8557,7 @@ run;
   Usage:
 
       %* load macros;
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %* export everything;
@@ -9359,7 +9361,7 @@ run;
 Usage:
 
     %* import the macros (or make them available some other way);
-    filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
     %inc mc;
 
     %* create sample text file as input to the macro;
@@ -9457,7 +9459,7 @@ run;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -9597,7 +9599,7 @@ options noquotelenmax;
   @details  Code is passed in as one or more filerefs.
 
     %* Step 1 - compile macros ;
-    filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
     %inc mc;
 
     %* Step 2 - Create some code and add it to a web service;
@@ -9648,7 +9650,7 @@ options noquotelenmax;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
@@ -10248,7 +10250,7 @@ run;
   @details If not executed in Studio 5+  will expect oauth token in a global 
   macro variable (default ACCESS_TOKEN).
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %mv_createwebservice(path=/Public/test, name=blah)
@@ -10265,7 +10267,7 @@ run;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -10399,7 +10401,7 @@ libname &libref1a clear;
   @details If not executed in Studio 5+  will expect oauth token in a global 
   macro variable (default ACCESS_TOKEN).
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %mv_createwebservice(path=/Public/test, name=blah)
@@ -10415,7 +10417,7 @@ libname &libref1a clear;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -10560,7 +10562,7 @@ libname &libref1a clear;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -10689,7 +10691,7 @@ libname &libref1 clear;
 
    @version VIYA V.03.04
    @author Allan Bowe
-   @source https://github.com/macropeople/macrocore
+   @source https://github.com/sasjs/core
  
    <h4> Dependencies </h4>
    @li mv_tokenrefresh.sas
@@ -10721,7 +10723,7 @@ libname &libref1 clear;
 
    @version VIYA V.03.04
    @author Allan Bowe
-   @source https://github.com/macropeople/macrocore
+   @source https://github.com/sasjs/core
  
    <h4> Dependencies </h4>
    @li mv_registerclient.sas
@@ -10746,7 +10748,7 @@ libname &libref1 clear;
   Using the macros here:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
   An administrator needs to set you up with an access code:
@@ -10770,7 +10772,7 @@ libname &libref1 clear;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -10857,7 +10859,7 @@ libname &libref1 clear;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -10960,7 +10962,7 @@ libname &libref1 clear;
   Using the macros here:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
   Now we can run the macro!
@@ -10985,7 +10987,7 @@ libname &libref1 clear;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -11066,7 +11068,7 @@ filename &fname1 clear;
   Using the macros here:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
   An administrator needs to set you up with an access code:
@@ -11090,7 +11092,7 @@ filename &fname1 clear;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -11161,7 +11163,7 @@ libname &libref1 clear;
 
    @version VIYA V.03.04
    @author Allan Bowe
-   @source https://github.com/macropeople/macrocore
+   @source https://github.com/sasjs/core
  
    <h4> Dependencies </h4>
    @li mv_tokenauth.sas
@@ -11196,7 +11198,7 @@ libname &libref1 clear;
   Using the macros here:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
   An administrator needs to set you up with an access code:
@@ -11220,7 +11222,7 @@ libname &libref1 clear;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -11297,7 +11299,7 @@ libname &libref1 clear;
   Using the macros here:
 
       filename mc url
-      "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
   An administrator needs to set you up with an access code:
@@ -11339,7 +11341,7 @@ libname &libref1 clear;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -11419,7 +11421,7 @@ libname &libref1 clear;
   Usage:
 
       %* compile macros;
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %* specific client with just openid scope;
@@ -11460,7 +11462,7 @@ libname &libref1 clear;
     
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -11657,7 +11659,7 @@ libname &libref clear;
 
   Usage:
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
 
@@ -11683,7 +11685,7 @@ libname &libref clear;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
@@ -11826,7 +11828,7 @@ filename &fref2 clear;
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/base/mf_getplatform.sas b/base/mf_getplatform.sas
index 4909aa7..021fe66 100644
--- a/base/mf_getplatform.sas
+++ b/base/mf_getplatform.sas
@@ -1,5 +1,5 @@
 /**
-  @file mf_getplatform
+  @file mf_getplatform.sas
   @brief Returns platform specific variables
   @details Enables platform specific variables to be returned
 
diff --git a/base/mp_createwebservice.sas b/base/mp_createwebservice.sas
index f2ad375..afb82c8 100644
--- a/base/mp_createwebservice.sas
+++ b/base/mp_createwebservice.sas
@@ -7,7 +7,7 @@
 Usage:
 
     %* compile macros ;
-    filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
     %inc mc;
 
     %* write some code;
diff --git a/base/mp_ds2cards.sas b/base/mp_ds2cards.sas
index f58d9cb..53b175d 100644
--- a/base/mp_ds2cards.sas
+++ b/base/mp_ds2cards.sas
@@ -179,7 +179,7 @@ data _null_;
     put '/*******************************************************************';
     put " Datalines for %upcase(%scan(&base_ds,2)) dataset ";
     put " Generated by %nrstr(%%)mp_ds2cards()";
-    put " Available on github.com/macropeople/macrocore";
+    put " Available on github.com/sasjs/core";
     put '********************************************************************/';
     put "data &tgt_ds &indexes;";
     put "attrib ";
diff --git a/base/mp_getddl.sas b/base/mp_getddl.sas
index 1455faa..3975015 100644
--- a/base/mp_getddl.sas
+++ b/base/mp_getddl.sas
@@ -29,7 +29,7 @@
 
   @version 9.3
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/base/mp_guesspk.sas b/base/mp_guesspk.sas
index a1a6f04..cb83237 100644
--- a/base/mp_guesspk.sas
+++ b/base/mp_guesspk.sas
@@ -11,7 +11,7 @@
 
   Usage:
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
       %mp_guesspk(sashelp.class,outds=classpks)
 
diff --git a/base/mp_jsonout.sas b/base/mp_jsonout.sas
index 9debcd5..4aabc5c 100644
--- a/base/mp_jsonout.sas
+++ b/base/mp_jsonout.sas
@@ -22,7 +22,8 @@
         run;
 
   If you are building web apps with SAS then you are strongly encouraged to use
-  the mX_createwebservice macros in combination with [sasjs](https://github.com/macropeople/sasjs).
+  the mX_createwebservice macros in combination with the 
+  [sasjs adapter](https://github.com/sasjs/adapter).
   For more information see https://sasjs.io
 
   @param action Valid values:
@@ -43,7 +44,7 @@
 
   @version 9.2
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/base/mp_perflog.sas b/base/mp_perflog.sas
index 4ec65fd..4fc9864 100644
--- a/base/mp_perflog.sas
+++ b/base/mp_perflog.sas
@@ -16,7 +16,7 @@
 
   @version 9.2
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/base/mp_runddl.sas b/base/mp_runddl.sas
index 797ed56..619cb63 100644
--- a/base/mp_runddl.sas
+++ b/base/mp_runddl.sas
@@ -37,7 +37,7 @@
 
   @version 9.3
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/base/mp_setkeyvalue.sas b/base/mp_setkeyvalue.sas
index 1ea38a7..b6d268f 100644
--- a/base/mp_setkeyvalue.sas
+++ b/base/mp_setkeyvalue.sas
@@ -17,7 +17,7 @@
 
   @version 9.2
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/base/mp_stprequests.sas b/base/mp_stprequests.sas
index b5682ea..a39ce30 100644
--- a/base/mp_stprequests.sas
+++ b/base/mp_stprequests.sas
@@ -28,7 +28,7 @@
 
   @version 9.2
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/base/mp_streamfile.sas b/base/mp_streamfile.sas
index b0dbf1f..f419e5d 100644
--- a/base/mp_streamfile.sas
+++ b/base/mp_streamfile.sas
@@ -6,7 +6,7 @@
 
   Usage:
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %mp_streamfile(contenttype=csv,inloc=/some/where.txt,outname=myfile.txt)
@@ -20,7 +20,7 @@
   @param outname= the name of the file, as downloaded by the browser
 
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/base/mp_unzip.sas b/base/mp_unzip.sas
index bcc6899..e587458 100644
--- a/base/mp_unzip.sas
+++ b/base/mp_unzip.sas
@@ -7,7 +7,7 @@
 
     Usage:
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %mp_unzip(ziploc="/some/file.zip",outdir=/some/folder)
@@ -21,7 +21,7 @@
 
   @version 9.4
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/base/mp_zip.sas b/base/mp_zip.sas
index cf68c03..6c16563 100644
--- a/base/mp_zip.sas
+++ b/base/mp_zip.sas
@@ -23,7 +23,7 @@
 
   @version 9.2
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/build.py b/build.py
index 69fec99..b34a57d 100755
--- a/build.py
+++ b/build.py
@@ -69,17 +69,17 @@ header="""
     'included' in SAS with just 2 lines of code:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
-    The `build.py` file in the https://github.com/macropeople/macrocore repo
+    The `build.py` file in the https://github.com/sasjs/core repo
     is used to create this file.
 
   @author Allan Bowe
 **/
 options noquotelenmax;
 """
-f = open('mc_all.sas', "w")             # r / r+ / rb / rb+ / w / wb
+f = open('all.sas', "w")             # r / r+ / rb / rb+ / w / wb
 f.write(header)
 folders=['base','meta','metax','viya','lua']
 for folder in folders:
diff --git a/doxy/build.sh b/doxy/build.sh
index fca6f88..875254b 100755
--- a/doxy/build.sh
+++ b/doxy/build.sh
@@ -28,8 +28,8 @@ echo "INPUT+=main.dox" >> $BUILD_FOLDER/Doxyfile
 doxygen Doxyfile
 
 # refresh github pages site
-git clone git@github.com:macropeople/macrocore.github.io.git
-cd macrocore.github.io
+git clone git@github.com:sasjs/core.github.io.git
+cd core.github.io
 git rm -r *
 mv $BUILD_FOLDER/out/doxy/* .
 echo 'core.sasjs.io' > CNAME
@@ -37,4 +37,4 @@ git add *
 git commit -m "build.sh build on $(date +%F:%H:%M:%S)"
 git push
 
-echo "check it out:  https://macropeople.github.io/macrocore.github.io/files.html"
+echo "check it out:  https://sasjs.github.io/core.github.io/files.html"
diff --git a/doxy/new_footer.html b/doxy/new_footer.html
index 45f5952..ca7b018 100644
--- a/doxy/new_footer.html
+++ b/doxy/new_footer.html
@@ -2,7 +2,7 @@
     <li class="footer"><b>$generatedby</b>
     <a href="http://www.doxygen.org/index.html">
     <img class="footer" src="doxygen.png" alt="doxygen"/></a>
-   <i> For more information visit the </i> <a href="https://github.com/macropeople/macrocore">macropeople MacroCore library</a>.</li>
+   <i> For more information visit the </i> <a href="https://github.com/sasjs/core">Macro Core library</a>.</li>
 
    </ul>
  </div>
@@ -10,7 +10,7 @@
 <!--BEGIN !GENERATE_TREEVIEW-->
 <hr class="footer"/>
 <table width="100%"><tbody><tr><td>
-For more information visit the <a href="https://github.com/macropeople/macrocore">macropeople MacroCore library</a>.
+For more information visit the <a href="https://github.com/sasjs/core">Macro Core library</a>.
 </td><td><address class="footer"><small>
 &copy;$year<br/>
 $generatedby <a href="http://www.doxygen.org/index.html">
diff --git a/doxy/new_header.html b/doxy/new_header.html
index bc563ea..e313df4 100644
--- a/doxy/new_header.html
+++ b/doxy/new_header.html
@@ -45,8 +45,8 @@ $extrastylesheet
   <td>
     <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/macropeople/macrocore">
-          https://github.com/macropeople/macrocore
+      <tr><td><a href="https://github.com/sasjs/core">
+          https://github.com/sasjs/core
       </a></td></tr>
     </table>
   </td>
diff --git a/main.dox b/main.dox
index 786d361..c4ef924 100644
--- a/main.dox
+++ b/main.dox
@@ -1,6 +1,6 @@
 
 /** \dir .
- *  \brief Open Source Macro Library for Developers of the SAS Language.  See: https://github.com/macropeople/macrocore
+ *  \brief Open Source Macro Library for Developers of the SAS Language.  See: https://github.com/sasjs/core
  *  \details To use - add the subfolders to your `SASAUTOS` call path.
  */
 
diff --git a/make_singlefile.sh b/make_singlefile.sh
index 753d2b9..9c10a94 100755
--- a/make_singlefile.sh
+++ b/make_singlefile.sh
@@ -13,10 +13,10 @@ cat > $OUTFILE <<'EOL'
     'included' in SAS with just 2 lines of code:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/macrocore.sas";
+        "https://raw.githubusercontent.com/sasjs/core/master/macrocore.sas";
       %inc mc;
 
-    The `build.sh` file in the https://github.com/macropeople/macrocore repo
+    The `build.sh` file in the https://github.com/sasjs/core repo
     is used to create this file.
 
   @author Allan Bowe
diff --git a/meta/mm_createwebservice.sas b/meta/mm_createwebservice.sas
index 75f666a..50ddc14 100644
--- a/meta/mm_createwebservice.sas
+++ b/meta/mm_createwebservice.sas
@@ -1,12 +1,12 @@
 /**
   @file mm_createwebservice.sas
   @brief Create a Web Ready Stored Process
-  @details This macro creates a Type 2 Stored Process with the macropeople
-            mm_webout macro included as pre-code.
+  @details This macro creates a Type 2 Stored Process with the mm_webout macro
+    included as pre-code.
 Usage:
 
     %* compile macros ;
-    filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
     %inc mc;
 
     %* parmcards lets us write to a text file from open code ;
diff --git a/meta/mm_getwebappsrvprops.sas b/meta/mm_getwebappsrvprops.sas
index 6e69d1f..bd94d54 100644
--- a/meta/mm_getwebappsrvprops.sas
+++ b/meta/mm_getwebappsrvprops.sas
@@ -1,13 +1,14 @@
 /**
   @file
   @brief Retrieves properties of the SAS web app server
-  @description usage:
+  @details 
+  Usage:
 
-    %mm_getwebappsrvprops(outds= some_ds)
-    data _null_;
-      set some_ds(where=(name='webappsrv.server.url'));
-      put value=;
-    run;
+      %mm_getwebappsrvprops(outds= some_ds)
+      data _null_;
+        set some_ds(where=(name='webappsrv.server.url'));
+        put value=;
+      run;
 
   @param outds the dataset to create that contains the list of properties
 
@@ -21,7 +22,7 @@
 
   @version 9.4
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/meta/mm_spkexport.sas b/meta/mm_spkexport.sas
index db2e369..c4d0701 100644
--- a/meta/mm_spkexport.sas
+++ b/meta/mm_spkexport.sas
@@ -12,7 +12,7 @@
   Usage:
 
       %* import the macros (or make them available some other way);
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %* create sample text file as input to the macro;
diff --git a/meta/mm_tree.sas b/meta/mm_tree.sas
index 7436259..f41dabd 100644
--- a/meta/mm_tree.sas
+++ b/meta/mm_tree.sas
@@ -15,7 +15,7 @@
   Usage:
 
       %* load macros;
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %* export everything;
diff --git a/metax/mmx_spkexport.sas b/metax/mmx_spkexport.sas
index e5c34c8..135488b 100644
--- a/metax/mmx_spkexport.sas
+++ b/metax/mmx_spkexport.sas
@@ -8,7 +8,7 @@
 Usage:
 
     %* import the macros (or make them available some other way);
-    filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
     %inc mc;
 
     %* create sample text file as input to the macro;
diff --git a/viya/mv_createfolder.sas b/viya/mv_createfolder.sas
index fca913a..6d6dfcb 100644
--- a/viya/mv_createfolder.sas
+++ b/viya/mv_createfolder.sas
@@ -16,7 +16,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_createwebservice.sas b/viya/mv_createwebservice.sas
index aa23991..e2f9f62 100644
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -4,7 +4,7 @@
   @details  Code is passed in as one or more filerefs.
 
     %* Step 1 - compile macros ;
-    filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
     %inc mc;
 
     %* Step 2 - Create some code and add it to a web service;
@@ -55,7 +55,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
 **/
 
diff --git a/viya/mv_deletefoldermember.sas b/viya/mv_deletefoldermember.sas
index a7f4c63..b452fa8 100644
--- a/viya/mv_deletefoldermember.sas
+++ b/viya/mv_deletefoldermember.sas
@@ -4,7 +4,7 @@
   @details If not executed in Studio 5+  will expect oauth token in a global 
   macro variable (default ACCESS_TOKEN).
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %mv_createwebservice(path=/Public/test, name=blah)
@@ -21,7 +21,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_deletejes.sas b/viya/mv_deletejes.sas
index 765a896..cb4d03d 100644
--- a/viya/mv_deletejes.sas
+++ b/viya/mv_deletejes.sas
@@ -4,7 +4,7 @@
   @details If not executed in Studio 5+  will expect oauth token in a global 
   macro variable (default ACCESS_TOKEN).
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %mv_createwebservice(path=/Public/test, name=blah)
@@ -20,7 +20,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_deleteviyafolder.sas b/viya/mv_deleteviyafolder.sas
index d00c0f3..2d22365 100644
--- a/viya/mv_deleteviyafolder.sas
+++ b/viya/mv_deleteviyafolder.sas
@@ -17,7 +17,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_getaccesstoken.sas b/viya/mv_getaccesstoken.sas
index b0d222f..42ae9c9 100644
--- a/viya/mv_getaccesstoken.sas
+++ b/viya/mv_getaccesstoken.sas
@@ -4,7 +4,7 @@
 
    @version VIYA V.03.04
    @author Allan Bowe
-   @source https://github.com/macropeople/macrocore
+   @source https://github.com/sasjs/core
  
    <h4> Dependencies </h4>
    @li mv_tokenrefresh.sas
diff --git a/viya/mv_getapptoken.sas b/viya/mv_getapptoken.sas
index 55ea08c..d77ae95 100644
--- a/viya/mv_getapptoken.sas
+++ b/viya/mv_getapptoken.sas
@@ -4,7 +4,7 @@
 
    @version VIYA V.03.04
    @author Allan Bowe
-   @source https://github.com/macropeople/macrocore
+   @source https://github.com/sasjs/core
  
    <h4> Dependencies </h4>
    @li mv_registerclient.sas
diff --git a/viya/mv_getclients.sas b/viya/mv_getclients.sas
index 1d5b8d7..b4a86ad 100644
--- a/viya/mv_getclients.sas
+++ b/viya/mv_getclients.sas
@@ -6,7 +6,7 @@
   Using the macros here:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
   An administrator needs to set you up with an access code:
@@ -30,7 +30,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_getfoldermembers.sas b/viya/mv_getfoldermembers.sas
index 469d302..624b2b6 100644
--- a/viya/mv_getfoldermembers.sas
+++ b/viya/mv_getfoldermembers.sas
@@ -16,7 +16,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_getgroupmembers.sas b/viya/mv_getgroupmembers.sas
index 35a47f1..3f09405 100644
--- a/viya/mv_getgroupmembers.sas
+++ b/viya/mv_getgroupmembers.sas
@@ -6,7 +6,7 @@
   Using the macros here:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
   Now we can run the macro!
@@ -31,7 +31,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_getgroups.sas b/viya/mv_getgroups.sas
index 9f96965..0a78840 100644
--- a/viya/mv_getgroups.sas
+++ b/viya/mv_getgroups.sas
@@ -6,7 +6,7 @@
   Using the macros here:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
   An administrator needs to set you up with an access code:
@@ -30,7 +30,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_getrefreshtoken.sas b/viya/mv_getrefreshtoken.sas
index 2d2cc7f..17b6f4a 100644
--- a/viya/mv_getrefreshtoken.sas
+++ b/viya/mv_getrefreshtoken.sas
@@ -4,7 +4,7 @@
 
    @version VIYA V.03.04
    @author Allan Bowe
-   @source https://github.com/macropeople/macrocore
+   @source https://github.com/sasjs/core
  
    <h4> Dependencies </h4>
    @li mv_tokenauth.sas
diff --git a/viya/mv_getusergroups.sas b/viya/mv_getusergroups.sas
index 7dd65bf..e539ad7 100644
--- a/viya/mv_getusergroups.sas
+++ b/viya/mv_getusergroups.sas
@@ -6,7 +6,7 @@
   Using the macros here:
 
       filename mc url
-        "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+        "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
   An administrator needs to set you up with an access code:
@@ -30,7 +30,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_getusers.sas b/viya/mv_getusers.sas
index cd328d6..791b96f 100644
--- a/viya/mv_getusers.sas
+++ b/viya/mv_getusers.sas
@@ -6,7 +6,7 @@
   Using the macros here:
 
       filename mc url
-      "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
   An administrator needs to set you up with an access code:
@@ -48,7 +48,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_registerclient.sas b/viya/mv_registerclient.sas
index bf6675a..d0a8641 100644
--- a/viya/mv_registerclient.sas
+++ b/viya/mv_registerclient.sas
@@ -12,7 +12,7 @@
   Usage:
 
       %* compile macros;
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
       %* specific client with just openid scope;
@@ -53,7 +53,7 @@
     
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_tokenauth.sas b/viya/mv_tokenauth.sas
index ead93b5..9e128cd 100644
--- a/viya/mv_tokenauth.sas
+++ b/viya/mv_tokenauth.sas
@@ -15,7 +15,7 @@
 
   Usage:
 
-      filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/master/mc_all.sas";
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
       %inc mc;
 
 
@@ -41,7 +41,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas
diff --git a/viya/mv_tokenrefresh.sas b/viya/mv_tokenrefresh.sas
index f49faeb..a519827 100644
--- a/viya/mv_tokenrefresh.sas
+++ b/viya/mv_tokenrefresh.sas
@@ -41,7 +41,7 @@
 
   @version VIYA V.03.04
   @author Allan Bowe
-  @source https://github.com/macropeople/macrocore
+  @source https://github.com/sasjs/core
 
   <h4> Dependencies </h4>
   @li mp_abort.sas