diff --git a/packages/dataabstract/namespaced/Api.DA.Server.pas b/packages/dataabstract/namespaced/Api.DA.Server.pas
new file mode 100644
index 0000000..050d30d
--- /dev/null
+++ b/packages/dataabstract/namespaced/Api.DA.Server.pas
@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Api.DA.Server;
+{$include ../src/dasdk.pas}
diff --git a/packages/dataabstract/namespaced/Api.DA.pas b/packages/dataabstract/namespaced/Api.DA.pas
new file mode 100644
index 0000000..79a62ce
--- /dev/null
+++ b/packages/dataabstract/namespaced/Api.DA.pas
@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Api.DA;
+{$include ../src/da.pas}
diff --git a/packages/dataabstract/namespaced/Api.RO.Server.pas b/packages/dataabstract/namespaced/Api.RO.Server.pas
new file mode 100644
index 0000000..4228e55
--- /dev/null
+++ b/packages/dataabstract/namespaced/Api.RO.Server.pas
@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Api.RO.Server;
+{$include ../src/rosdk.pas}
diff --git a/packages/dataabstract/namespaced/Data.DA.pas b/packages/dataabstract/namespaced/Data.DA.pas
new file mode 100644
index 0000000..2636c38
--- /dev/null
+++ b/packages/dataabstract/namespaced/Data.DA.pas
@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Data.DA;
+{$include ../src/dadataset.pas}
diff --git a/packages/dataabstract/da.pas b/packages/dataabstract/src/da.pas
similarity index 98%
rename from packages/dataabstract/da.pas
rename to packages/dataabstract/src/da.pas
index ead5885..98c64e8 100644
--- a/packages/dataabstract/da.pas
+++ b/packages/dataabstract/src/da.pas
@@ -13,14 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS} 
 unit DA;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch externalclass}
 
 interface
 
-uses Sysutils, Types, JS, DASDK;
+uses 
+{$IFDEF FPC_DOTTEDUNITS} 
+  System.SysUtils, System.Types, JSApi.JS, Api.DA.Server;
+{$ELSE}
+  Sysutils, Types, JS, DASDK;
+{$ENDIF}
 
 Type
   TDADataType = ( datUnknown, datString, datDateTime, datFloat, datCurrency,
diff --git a/packages/dataabstract/dadataset.pas b/packages/dataabstract/src/dadataset.pas
similarity index 99%
rename from packages/dataabstract/dadataset.pas
rename to packages/dataabstract/src/dadataset.pas
index 2cd9850..71066ea 100644
--- a/packages/dataabstract/dadataset.pas
+++ b/packages/dataabstract/src/dadataset.pas
@@ -13,7 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS} 
 unit dadataset;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch externalclass}
@@ -21,7 +23,13 @@ unit dadataset;
 
 interface
 
-uses Types, Classes, DB, jsonDataset, JS, rosdk, da, dasdk;
+uses 
+{$IFDEF FPC_DOTTEDUNITS} 
+  System.Types, System.Classes, Data.DB, Data.JsonDataset, JSApi.JS, 
+  Api.RO.Server, Api.DA, Api.DA.Server;
+{$ELSE}
+  Types, Classes, DB, jsonDataset, JS, rosdk, da, dasdk;
+{$ENDIF}
 
 Type
   // Server sends data as a regular string.
@@ -277,7 +285,12 @@ Type
 
 implementation
 
-uses strutils, sysutils;
+uses 
+{$IFDEF FPC_DOTTEDUNITS} 
+  System.StrUtils, System.SysUtils;
+{$ELSE}
+  strutils, sysutils;
+{$ENDIF}
 
 resourcestring
   SErrInvalidDate = '%s is not a valid date value for %s';
diff --git a/packages/dataabstract/dasdk.pas b/packages/dataabstract/src/dasdk.pas
similarity index 98%
rename from packages/dataabstract/dasdk.pas
rename to packages/dataabstract/src/dasdk.pas
index ca77390..76d4779 100644
--- a/packages/dataabstract/dasdk.pas
+++ b/packages/dataabstract/src/dasdk.pas
@@ -13,14 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS} 
 unit dasdk;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch externalclass}
 
 interface
 
-uses JS, ROSDK;
+uses 
+{$IFDEF FPC_DOTTEDUNITS} 
+  JSApi.JS, Api.RO.Server;
+{$ELSE}
+  JS, ROSDK;
+{$ENDIF}
 
 Type
   TDAUserInfo = Class;
diff --git a/packages/dataabstract/rosdk.pas b/packages/dataabstract/src/rosdk.pas
similarity index 98%
rename from packages/dataabstract/rosdk.pas
rename to packages/dataabstract/src/rosdk.pas
index 68326a1..7f2cfb6 100644
--- a/packages/dataabstract/rosdk.pas
+++ b/packages/dataabstract/src/rosdk.pas
@@ -13,7 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS} 
 unit ROSDK;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch externalclass}
@@ -21,7 +23,11 @@ unit ROSDK;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS} 
+  System.Types, JSApi.JS;
+{$ELSE}
   Types, JS;
+{$ENDIF}
 
 Type
   TROValue = record
@@ -220,7 +226,12 @@ Var
 
 implementation
 
-uses Sysutils;
+uses 
+{$IFDEF FPC_DOTTEDUNITS} 
+  System.SysUtils;
+{$ELSE}
+  Sysutils;
+{$ENDIF}
 
 Resourcestring
   SDefaultUnexpectedErrorMsg = 'An unexpected error occurred';