diff --git a/.gitignore b/.gitignore
index 4c05fef..07c2177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,13 @@
 *.o
 *.ocx
 *.dcu
-*.dproj
+*.exe
+*.res
+*.local
+*.identcache
+*.otares
+*.vlb
+
 
 # Delphi autogenerated files (duplicated info)
 *.cfg
diff --git a/Interfaces.pas b/Interfaces.pas
deleted file mode 100644
index 2c8560d..0000000
--- a/Interfaces.pas
+++ /dev/null
@@ -1,1459 +0,0 @@
-unit Interfaces;
-{$I TBGWebCharts.inc}
-interface
-uses
-  {$IF RTLVERSION > 22 }
-    {$IFDEF HAS_FMX}
-      {$IFDEF HAS_CHROMIUM}
-        {$DEFINE HAS_CALLBACK}
-      {$ENDIF}
-    {$ELSE}
-      {$DEFINE HAS_CALLBACK}
-    {$ENDIF}
-  {$ENDIF}
-  DB,
-  Generics.Collections,
-  {$IFDEF HAS_FMX}
-    FMX.StdCtrls,
-    FMX.WebBrowser,
-  {$ELSE}
-    {$IF RTLVERSION > 27 }
-      VCL.StdCtrls,
-      VCL.Buttons,
-      SHDocVw,
-    {$IFEND}
-    {$IF RTLVERSION < 28 }
-      StdCtrls,
-      Buttons,
-      SHDocVw,
-    {$IFEND}
-  {$ENDIF}
-  {$IFDEF HAS_CHROMIUM}
-    uCEFInterfaces,
-    {$IFDEF HAS_FMX}
-      uCEFFMXChromium,
-      uCEFFMXWindowParent,
-    {$ELSE}
-      uCEFChromium,
-      uCEFWindowParent,
-    {$ENDIF}
-  {$ENDIF}
-   System.SysUtils,
-   Classes,
-   Charts.Types, Colors.Bootstrap;
-type
-  iWebCharts = interface;
-  iModelHTML = interface;
-  iModelHTMLChartsBar = interface;
-  iModelHTMLCharts = interface;
-  iModelHTMLChartsConfig = interface;
-  IModelRowsTitleConfig = interface;
-  IModelHTMLRows = interface;
-  iModelHTMLRowsTitle = interface;
-  IModelHTMLRowsTag = interface;
-  iModelHTMLChartsDoughnut = interface;
-  iModelHTMLChartsLines = interface;
-  iModelHTMLDataSet = interface;
-  iModelHTMLChartsLineStacked = interface;
-  iModelHTMLChartsPie = interface;
-  iModelLabellingConfig<T> = interface;
-  iModelHTMLChartsAxes = interface;
-  iModelHTMLChartsAxesTicks<T> = interface;
-  iModelHTMLChartsAxesParam = interface;
-  iModelHTMLChartsAxesParamRealTime = interface;
-  iModelHTMLChartsAxesGridLines<T> = interface;
-  iModelHTMLChatsAxesScaleLabel<T> = interface;
-  iModelHTMLLegendLabels<T> = interface;
-  iModelHTMLLegend = interface;
-  iModelHTMLTitle<T> = interface;
-  iModelHTMLScales = interface;
-  iModelHTMLTooltip<T> = interface;
-  iModelHTMLOptions = interface;
-  iModelHTMLChartsGeneric = interface;
-  iModelJumbotron = interface;
-  iModelAlerts = interface;
-  iModelAlertsClass = interface;
-  iModelListGroup = interface;
-  iModelListGroupClass = interface;
-  iModelPivotTable = interface;
-  iModelGenericList<T> = interface;
-  iModelPivotTableConfig = interface;
-  iModelPivotTableClass = interface;
-  iModelGenericStyle<T> = interface;
-  iModelGenericDataSet<T> = interface;
-  iModelJSCommand = interface;
-  iModelHTMLPlugins = interface;
-  iModelTableActionImage = Interface;
-  iModelTableAction = interface;
-  iModelBrowser = interface;
-  iModelGenericCoordinates<T> = interface;
-  iModelCredenciais = interface;
-  iModelDOMElement = interface;
-  iModelMaps = interface;
-  iModelGenericTitle<T> = interface;
-  iModelMapsGeneric = interface;
-  iModelMapsOptions = interface;
-  iModelMapsDraw = interface;
-  iModelMapsDrawCircle = interface;
-  iModelMapsDrawMarker = interface;
-  iModelMapsLayer = interface;
-  iModelMapsLayerHeatMap = interface;
-  iModelMapsDataSet<T> = interface;
-  iModelMapsInfoWindow<T> = interface;
-  iModelMapsRoutes = interface;
-  iModelMapsRoutesDirections = interface;
-  iModelMapsRoutesDirectionsPanel = interface;
-  {$IFDEF HAS_CHROMIUM}
-    iModelChromiumResources = interface;
-    iModelChromiumResourcesPages = interface;
-    iModelChromiumResourcesJSCallback = interface;
-  {$ENDIF}
-  iModelLiquidFillGauge = interface;
-  iModelLiquidFillGaugeConfig = interface;
-  iModelCardStyled = interface;
-  iModelCardStyledGeneric = interface;
-  iModelCardStyledText = interface;
-  iModelCardStyledShape = interface;
-  iModelCardStyledShapeClasses = interface;
-  iModelCardStyledCallback = interface;
-  iModelRichTextEditor = interface;
-  iModelRichTextEditorConfig = interface;
-  iModelRichTextEditorConfigPrintHeader = interface;
-  iModelGenericProgressBar<T> = interface;
-  iModelProgress = interface;
-  iModelProgressInfo = interface;
-  iModelProgressInfoText = interface;
-  iModelProgressInfoIcon = interface;
-  {$IFDEF FULL}
-    iModelTable = interface;
-    iModelTableDataSet = interface;
-    iModelTableOption = interface;
-    iModelTableData = interface;
-    iModelTableFeatures = interface;
-    iModelTableClass = interface;
-    IModelHTMLRowsDiv = interface;
-    iModelCardsDataSet = interface;
-    iModelCards = interface;
-    iModelChartEasyPie = interface;
-    iModelButtonClass = interface;
-    iModelButton = interface;
-    {$IFDEF HAS_CALLBACK}
-      iCallbackJS = interface;
-    {$ENDIF}
-    iModelImageDataSet = interface;
-    iModelImage = interface;
-    iModelImageClass = interface;
-    IModelHTMLRowsP = interface;
-    //iCacheControl = interface;
-  {$ENDIF}
-  iWebCharts = interface
-    ['{D98D23CE-5E37-4941-89E3-92AF922ACE60}']
-    function NewProject : iModelHTML; overload;
-    function NewProject(Container : Boolean) : iModelHTML; overload;
-    function ContinuosProject : iModelHTML;
-    function AddResource(Value : String) : iWebCharts;
-    function BackgroundColor(Value : String) : iWebCharts;
-    function Container(Value : TTypeContainer) : iWebCharts;
-    function FontColor(Value : String) : iWebCharts;
-    function CDN(Value : Boolean) : iWebCharts;
-    function Credenciais : iModelCredenciais;
-  end;
-  iModelHTML = interface
-    ['{6D5210CC-D750-4643-8685-48037F21E6AA}']
-    function GenerateHead : iModelHTML; overload;
-    function GenerateHead(Value : TList<String>) : iModelHTML; overload;
-    function GenerateFooter : iModelHTML;
-    function Jumpline : iModelHTML;
-    function Charts : iModelHTMLCharts;
-    function Rows : IModelHTMLRows;
-    function HTML(Value : String) : iModelHTML; overload;
-    function HTML : String; overload;
-    function ClearHTML : iModelHTML;
-    function WebBrowser(Value : TWebBrowser) : iModelHTML; overload;
-    {$IFDEF HAS_CHROMIUM}
-      {$IFDEF HAS_FMX}
-        function WebBrowser(Value : TFMXChromium) : iModelHTML; overload;
-        function WindowParent(Value: TFMXWindowParent) : iModelHTML; overload;
-      {$ELSE}
-        function WebBrowser(Value : TChromium) : iModelHTML; overload;
-        function WindowParent(Value: TCEFWindowParent) : iModelHTML; overload;
-      {$ENDIF}
-      function Maps : iModelMaps;
-    {$ENDIF}
-    function Generated : iModelHTML;
-    function Container(Value : Boolean) : iModelHTML;
-    function FolderDefaultRWC(Value : String) : iModelHTML;
-    function BackgroundColor( Value : String) : iModelHTML;
-    function FontColor ( Value : String) : iModelHTML;
-    function ContainerClass(Value : TTypeContainer) : iModelHTML;
-    function CDN(Value : Boolean) : iModelHTML;
-    function Jumbotron : iModelJumbotron;
-    function Alerts : iModelAlerts;
-    function ListGroup : iModelListGroup;
-    function PivotTable : iModelPivotTable;
-    function LiquiFillGauge : iModelLiquidFillGauge;
-    procedure ExecuteScript(Value : iModelJSCommand);
-    function ExecuteScriptResult(Value : iModelJSCommand) : string;
-    procedure ExecuteScriptCallback(Value: iModelJSCommand);
-    function Credenciais(Value : iModelCredenciais) : iModelHTML;
-    function DOMElement : iModelDomElement;
-    function RichTextEditor : iModelRichTextEditor;
-    function Print : iModelHTML;
-    function Progress : iModelProgress;
-    {$IFDEF FULL}
-      function Table : iModelTable;
-      function Cards : iModelCards;
-      function CardStyled : iModelCardStyled;
-      function ChartEasyPie : iModelChartEasyPie;
-      {$IFDEF HAS_CALLBACK}
-        function CallbackJS : iCallbackJS;
-        function Buttons : iModelButton;
-      {$ENDIF}
-      function Image : iModelImage;
-      //function CacheControl : iCacheControl;
-    {$ENDIF}
-  end;
-  iModelDomElement = interface
-    function Id(Value : string) : iModelDomElement;
-    function Html(Value : string) : iModelDomElement;
-    function Update : iModelDOMElement;
-    function &End : iModelHTML;
-  end;
-  iModelCredenciais = interface
-    ['{FCE8B965-DB1B-42E6-B831-588BB955A88A}']
-    function APIGoogle(Value : string) : iModelCredenciais; overload;
-    function APIGoogle : string; overload;
-    function &End : iWebCharts;
-  end;
-  iModelBrowser = interface
-  ['{90CE8FFC-31D4-423B-A585-5A6B5E01A3F8}']
-    procedure ExecuteScript(Value : iModelJSCommand);
-    function ExecuteScriptResult(Value : iModelJSCommand) : string;
-    procedure ExecuteScriptCallback(Value: iModelJSCommand);
-    function Generated(FHTML : string) : iModelBrowser;
-  end;
-
-  iModelMaps = interface
-    ['{6FB8BE17-5803-418D-B9A6-2448DFE5B6F9}']
-    function MapType(Value : TTypeMaps) : iModelMapsGeneric;
-    function MapTitle : iModelGenericTitle<iModelMaps>;
-    function &End : iModelHTML;
-  end;
-  iModelGenericTitle<T> = interface
-    ['{BBADD905-F041-4B05-8729-5F6ED7C3F286}']
-    function Text(Value : string) : iModelGenericTitle<T>; overload;
-    function FontSize(Value : Integer) : iModelGenericTitle<T>; overload;
-    function FontSize(Value : String) : iModelGenericTitle<T>; overload;
-    function TextAlignment(Value : string) : iModelGenericTitle<T>; overload;
-    function FontColorHEX(Value : string) : iModelGenericTitle<T>; overload;
-    function FontColor(Value : string) : iModelGenericTitle<T>; overload;
-    function FontFamily(Value : string) : iModelGenericTitle<T>; overload;
-    function Text : string; overload;
-    function FontSize : String; overload;
-    function TextAlignment : string; overload;
-    function FontColorHEX : string; overload;
-    function FontColor : string; overload;
-    function FontFamily : string; overload;
-    function Result : string;
-    function &End : T;
-  end;
-  iModelMapsGeneric = interface
-    ['{9831E9BF-E318-4D65-9722-B1A8E9562AC3}']
-    function Name(Value : String) : iModelMapsGeneric; overload;
-    function Options : iModelMapsOptions;
-    function Height(Value : String) : iModelMapsGeneric;
-    function Width(Value : String) : iModelMapsGeneric;
-    function Draw : iModelMapsDraw;
-    function Layer : iModelMapsLayer;
-    function Routes : iModelMapsRoutes;
-    function Name : String; overload;
-    function &End : iModelMaps;
-    function GetGeoCodeResult(Value: TProc<String>) : iModelMapsGeneric;
-    function GetDirectionResult(Value: TProc<String>) : iModelMapsGeneric;
-    function ResultClass : string;
-  end;
-  iModelMapsOptions = interface
-    ['{ADAAA471-ED18-411D-9855-04ABFCCBB9B6}']
-    function Center : iModelGenericCoordinates<iModelMapsOptions>;
-    function Zoom(Value : Integer) : iModelMapsOptions;
-    function FullScreenControl : iModelMapsOptions; overload;
-    function FullScreenControl(Value : Boolean) : iModelMapsOptions; overload;
-    function MapTypeControl : iModelMapsOptions; overload;
-    function MapTypeControl(Value : Boolean) : iModelMapsOptions; overload;
-    function StreetViewControl : iModelMapsOptions; overload;
-    function StreetViewControl(Value : Boolean) : iModelMapsOptions; overload;
-    function ZoomControl : iModelMapsOptions; overload;
-    function ZoomControl(Value : Boolean) : iModelMapsOptions; overload;
-    function RotateControl(Value : Boolean) : iModelMapsOptions; overload;
-    function Tilt(Value : Boolean) : iModelMapsOptions; overload;
-    function MapStyle(Value: TTypeMapStyle) : iModelMapsOptions;
-    function ResultScript : String;
-    function &End : iModelMapsGeneric;
-  end;
-  iModelMapsDraw = interface
-    ['{00620760-9D3F-48FE-9FB4-91CB43C64F53}']
-    function Marker : iModelMapsDrawMarker;
-    function Circle : iModelMapsDrawCircle;
-    function ResultScript : String;
-    function &End : iModelMapsGeneric;
-  end;
-  iModelMapsDrawMarker = interface
-    ['{03FDD2B8-7C64-41C1-A9B6-4284EBE6B997}']
-    function DataSet : iModelMapsDataSet<iModelMapsDrawMarker>;
-    function InfoWindow : iModelMapsInfoWindow<iModelMapsDrawMarker>;
-    function ResultScript(Value: string) : String;
-    function &End : iModelMapsDraw;
-  end;
-  iModelMapsDrawCircle = interface
-    ['{14E21290-71DA-4BE7-919B-DA81B6E765E7}']
-    function DataSet : iModelMapsDataSet<iModelMapsDrawCircle>;
-    function StrokeColor(Value: string): iModelMapsDrawCircle;
-    function StrokeOpacity(Value : string) : iModelMapsDrawCircle;
-    function StrokeWeight(Value : Integer) : iModelMapsDrawCircle;
-    function FillColor(Value : string) : iModelMapsDrawCircle;
-    function FillOpacity(Value : string) : iModelMapsDrawCircle;
-    function Fator(Value : integer) : iModelMapsDrawCircle;
-    function InfoWindow : iModelMapsInfoWindow<iModelMapsDrawCircle>;
-    function ResultScript(MapName: string) : String;
-    function &End : iModelMapsDraw;
-  end;
-  iModelMapsLayer = interface
-    ['{ACABBD56-A9D9-4D0B-85B1-6D115C218FAD}']
-    function HeatMap : iModelMapsLayerHeatMap;
-    function &End : iModelMapsGeneric;
-    function ResultScript : String;
-  end;
-  iModelMapsLayerHeatMap = interface
-    ['{A46B4845-FF76-48D5-AB8A-C7F39D0FE34C}']
-    function DataSet : iModelMapsDataSet<iModelMapsLayerHeatMap>;
-    function Radius(Value : string) : iModelMapsLayerHeatMap;
-    function Opacity(Value : string) :iModelMapsLayerHeatMap;
-    function &End : iModelMapsLayer;
-    function ResultScript(MapName: string) : String;
-  end;
-  iModelMapsDataSet<T> = interface
-    ['{F58E5C44-D904-4347-BC57-CF7889DB4DD1}']
-    function DataSet (Value : TDataSet) : iModelMapsDataSet<T>; overload;
-    function LatName(Value : String) : iModelMapsDataSet<T>; overload;
-    function LngName(Value : String) : iModelMapsDataSet<T>; overload;
-    function LabelName(Value : String) : iModelMapsDataSet<T>; overload;
-    function ValueName(Value : String) : iModelMapsDataSet<T>; overload;
-    function AddressName(Value : String) : iModelMapsDataSet<T>; overload;
-    function IdAddressName(Value : String) : iModelMapsDataSet<T>; overload;
-    function InfoName(Value : String) : iModelMapsDataSet<T>; overload;
-    function DataSet : TDataSet; overload;
-    function LatName : String; overload;
-    function LngName : String; overload;
-    function LabelName : String; overload;
-    function ValueName : String; overload;
-    function AddressName : String; overload;
-    function IdAddressName : String; overload;
-    function InfoName : String; overload;
-    function &End : T;
-  end;
-  iModelMapsInfoWindow<T> = interface
-    ['{E850C6C0-C800-49A1-A582-725CEDE94178}']
-    function StartOpened(Value : boolean) : iModelMapsInfoWindow<T>; overload;
-    function MaxWidth(Value : integer) : iModelMapsInfoWindow<T>; overload;
-    function MinWidth(Value : integer) : iModelMapsInfoWindow<T>; overload;
-    function StartOpened : string; overload;
-    function MaxWidth : string; overload;
-    function MinWidth : string; overload;
-    function &End : T;
-  end;
-  iModelMapsRoutes = interface
-    ['{26523E12-4DFB-482B-B549-DB3CFD2E8A96}']
-    function Directions : iModelMapsRoutesDirections;
-    function &End : iModelMapsGeneric;
-    function ResultScript : String;
-  end;
-  iModelMapsRoutesDirections = interface
-    ['{BC86B376-85F0-4939-8A7B-169F54D6AA88}']
-    function DataSet : iModelMapsDataSet<iModelMapsRoutesDirections>;
-    function Origin(Value : string) : iModelMapsRoutesDirections;
-    function Destination(Value : string) : iModelMapsRoutesDirections;
-    function TravelMode(Value : TTypeMapTravelMode) : iModelMapsRoutesDirections;
-    function OptimizeWaypoints(Value : boolean) : iModelMapsRoutesDirections;
-    function Panel : iModelMapsRoutesDirectionsPanel;
-    function ResultScript(MapName: string) : String;
-    function &End : iModelMapsRoutes;
-  end;
-  iModelMapsRoutesDirectionsPanel = interface
-    ['{12C3A169-AB02-494B-871B-C37259B4C023}']
-    function Width(Value : String) : iModelMapsRoutesDirectionsPanel; overload;
-    function Width : String; overload;
-    function FloatPos(Value : string) : iModelMapsRoutesDirectionsPanel; overload;
-    function FloatPos : string; overload;
-    function &End : iModelMapsRoutesDirections;
-  end;
-  {$IFDEF HAS_CHROMIUM}
-    iModelChromiumResourcesPages = interface
-      ['{30782EC6-B430-4FC1-9B23-D06693BE23D4}']
-      function Add(HTML : String) : string;
-      function Get(Key : String) : ICefResourceHandler;
-      function Extract(Key : String) :ICefResourceHandler;
-      procedure Remove(Key : String);
-    end;
-    iModelChromiumResourcesJSCallback = interface
-      ['{384A33CB-A7E7-40C3-88EA-F656605C0964}']
-      function Add(Proc : TProc<string>) : string;
-      function Get(Key : String) : TProc<string>;
-      function Extract(Key : String) :TProc<string>;
-      procedure Remove(Key : String);
-    end;
-    iModelChromiumResources = interface
-      ['{16F507A0-D848-4491-AF0A-8AE73782FBB2}']
-      function Pages : iModelChromiumResourcesPages;
-      function JSCallback : iModelChromiumResourcesJSCallback;
-    end;
-  {$ENDIF}
-  iModelLiquidFillGauge = interface
-    ['{9ECA3F3B-E741-4B9E-9FAE-46A52D195CD5}']
-    function Align(Value :string) : iModelLiquidFillGauge;
-    function Config : iModelLiquidFillGaugeConfig;
-    function Height(Value : string) : iModelLiquidFillGauge;
-    function Name(Value : string) : iModelLiquidFillGauge; overload;
-    function Name : string; overload;
-    function Title : iModelGenericTitle<iModelLiquidFillGauge>;
-    function Width(Value : string) : iModelLiquidFillGauge;
-    function Value(Value : string) : iModelLiquidFillGauge;
-    function UpdateValue : iModelLiquidFillGauge;
-    function &End : iModelHTML;
-  end;
-  iModelLiquidFillGaugeConfig = interface
-    ['{A8E00200-7895-4E94-9492-7A5BE4863B04}']
-    function MinValue(Value : integer) : iModelLiquidFillGaugeConfig;
-    function MaxValue(Value : integer) : iModelLiquidFillGaugeConfig;
-    function CircleThickness(Value : Integer) : iModelLiquidFillGaugeConfig;
-    function CircleFillGap(Value : Integer) : iModelLiquidFillGaugeConfig;
-    function CircleColorHex(Value : string) : iModelLiquidFillGaugeConfig;
-    function CircleColor(Value : string) : iModelLiquidFillGaugeConfig;
-    function WaveHeight(Value : Integer) : iModelLiquidFillGaugeConfig;
-    function WaveCount(Value : Integer) : iModelLiquidFillGaugeConfig;
-    function WaveRiseTime(Value : Integer) : iModelLiquidFillGaugeConfig;
-    function WaveAnimateTime(Value : Integer) : iModelLiquidFillGaugeConfig;
-    function WaveRise(Value : Boolean) : iModelLiquidFillGaugeConfig;
-    function WaveHeightScaling(Value : Boolean) : iModelLiquidFillGaugeConfig;
-    function WaveAnimate(Value : Boolean) : iModelLiquidFillGaugeConfig;
-    function WaveColor(Value : string) : iModelLiquidFillGaugeConfig;
-    function WaveColorHex(Value : string) : iModelLiquidFillGaugeConfig;
-    function WaveOffset(Value : Integer) : iModelLiquidFillGaugeConfig;
-    function TextVertPosition(Value : Integer) : iModelLiquidFillGaugeConfig;
-    function TextSize(Value : Integer) : iModelLiquidFillGaugeConfig;
-    function ValueCountUp(Value : Boolean) : iModelLiquidFillGaugeConfig;
-    function DisplayPercent(Value : Boolean) : iModelLiquidFillGaugeConfig;
-    function TextColor(Value : string) : iModelLiquidFillGaugeConfig;
-    function TextColorHex(Value : string) : iModelLiquidFillGaugeConfig;
-    function WaveTextColor(Value : string) : iModelLiquidFillGaugeConfig;
-    function WaveTextColorHex(Value : string) : iModelLiquidFillGaugeConfig;
-    function ResultScript : String;
-    function &End : iModelLiquidFillGauge;
-  end;
-
-  iModelCardStyled = interface
-    ['{9DB61CB7-D7D1-4E62-80AE-815CD0BC3717}']
-    function CardType(Value : TTypeCardStyled) : iModelCardStyledGeneric;
-    function &End : iModelHTML;
-  end;
-
-  iModelCardStyledGeneric = interface
-    ['{3CE71864-DAF3-4C3A-8CEA-A715BBDDD85C}']
-    function BackgroundColor(Value : String) : iModelCardStyledGeneric;
-    function Body : iModelCardStyledText;
-    function Callback : iModelCardStyledCallback;
-    function Col(Value : Integer) : iModelCardStyledGeneric;
-    function Colmd(Value : Integer) : iModelCardStyledGeneric;
-    function Colxl(Value : Integer) : iModelCardStyledGeneric;
-    function DefaultFontColor(Value : string) : iModelCardStyledGeneric;
-    function Footer : iModelCardStyledText;
-    function HTML : String;
-    function Name( Value : String) : iModelCardStyledGeneric;
-    function Shape : iModelCardStyledShape;
-    function Progress : iModelGenericProgressBar<iModelCardStyledGeneric>;
-    function Title : iModelCardStyledText;
-    function &End : iModelCardStyled;
-  end;
-  iModelCardStyledCallback = interface
-    ['{9F8311B1-92BC-49FC-BCDD-CC5DCED5C3FD}']
-    function MethodName(aValue : string) : iModelCardStyledCallback;
-    function ParamValue(aValue : string) : iModelCardStyledCallback;
-    function ResultClass : string;
-    function &End : iModelCardStyledGeneric;
-  end;
-  iModelCardStyledText = interface
-    ['{C6A880DD-CA67-4335-9FD8-378A334CD59A}']
-    function Style : iModelGenericStyle<iModelCardStyledText>;
-    function Text(Value : String) : iModelCardStyledText; overload;
-    function Text : String; overload;
-    function &End : iModelCardStyledGeneric;
-  end;
-  iModelCardStyledShape = interface
-    ['{DD59592F-FA79-4E15-84C4-C53143A0F1A6}']
-    function Icon(Value : String) :  iModelCardStyledShape;
-    function ColAuto(Value : boolean) : iModelCardStyledShape;
-    function ResultClass : String;
-    function ShapeClass : iModelCardStyledShapeClasses;
-    function Style : iModelGenericStyle<iModelCardStyledShape>;
-    function Text(Value : String) : iModelCardStyledShape;
-    function &End : iModelCardStyledGeneric;
-  end;
-  iModelCardStyledShapeClasses = interface
-    ['{B03205C4-5A8A-49D9-B37F-DBD47AAC999A}']
-    function ResultShapeClass : String;
-    function RoundedCircle : iModelCardStyledShapeClasses;
-    function Rounded : iModelCardStyledShapeClasses;
-    function Shadow : iModelCardStyledShapeClasses;
-    function &End : iModelCardStyledShape;
-  end;
-
-  iModelRichTextEditor = interface
-    ['{B06FEC4A-D856-405A-BBCA-9DC9B1ABBD68}']
-    function Attributes : iModelRichTextEditorConfig;
-    function LoadContent(aValue : String) : iModelRichTextEditor;
-    function SaveContent(Value : TProc<String>) : iModelRichTextEditor;
-    function SaveContentHtml(Value : TProc<String>) : iModelRichTextEditor;
-    function SaveContentText(Value : TProc<String>) : iModelRichTextEditor;
-    function &End : iModelHTML;
-  end;
-  iModelRichTextEditorConfig = interface
-    ['{F17E30E3-C930-4907-B79E-9A7D1DABFFF6}']
-    function Content(aValue : String) : iModelRichTextEditorConfig;
-    function Height(aValue : string) : iModelRichTextEditorConfig;
-    function Width(aValue : string) : iModelRichTextEditorConfig;
-    function Margin(aValue : string) : iModelRichTextEditorConfig;
-    function MaxHeight(aValue : string) : iModelRichTextEditorConfig;
-    function MaxWidth(aValue : string) : iModelRichTextEditorConfig;
-    function PlaceHolder(aValue : String) : iModelRichTextEditorConfig;
-    function PrintHeader : iModelRichTextEditorConfigPrintHeader;
-    function ReadOnly(aValue : Boolean) : iModelRichTextEditorConfig;
-    function ResultStyleContainer : String;
-    function ResultStyleEditor : String;
-    function ResultConfig : String;
-    function ResultContent : String;
-    function ResultPrintHeader : String;
-    function &End : iModelRichTextEditor;
-  end;
-  iModelRichTextEditorConfigPrintHeaderDiv = interface;
-  iModelRichTextEditorConfigPrintHeaderImage = interface;
-  iModelRichTextEditorConfigPrintHeaderTitle = interface;
-  iModelRichTextEditorConfigPrintHeader = interface
-    ['{7011CAA5-ACA4-4CB6-A41C-61BCBDF083FA}']
-    function &Div : iModelRichTextEditorConfigPrintHeaderDiv;
-    function HTML : String;
-    function &End : iModelRichTextEditorConfig;
-  end;
-
-  iModelRichTextEditorConfigPrintHeaderDiv = interface
-    ['{21CC0E25-6451-4E02-8CDE-0B5BF457586A}']
-    function Image : iModelRichTextEditorConfigPrintHeaderImage;
-    function Col(aValue : Integer) : iModelRichTextEditorConfigPrintHeaderDiv; overload;
-    function Col(aValue : String) : iModelRichTextEditorConfigPrintHeaderDiv; overload;
-    function Title : iModelRichTextEditorConfigPrintHeaderTitle;
-    function HTML : String;
-    function &End : iModelRichTextEditorConfigPrintHeader;
-  end;
-  iModelRichTextEditorConfigPrintHeaderImage = interface
-    ['{D9AD1ABA-940A-4CBA-AA1D-2E1C2D2D234C}']
-    function HTML : String;
-    function Image (aValue : TCustomMemoryStream) : iModelRichTextEditorConfigPrintHeaderImage; overload;
-    function Image (aValue : String) : iModelRichTextEditorConfigPrintHeaderImage; overload;
-    function Style : iModelGenericStyle<iModelRichTextEditorConfigPrintHeaderImage>;
-    function &End : iModelRichTextEditorConfigPrintHeaderDiv;
-  end;
-
-  iModelRichTextEditorConfigPrintHeaderTitle = interface
-    ['{35743850-BD83-49C4-A0DD-BCDBD70A9911}']
-    function HTML : String;
-    function Text (aValue : String) : iModelRichTextEditorConfigPrintHeaderTitle; overload;
-    function Style : iModelGenericStyle<iModelRichTextEditorConfigPrintHeaderTitle>;
-    function &End : iModelRichTextEditorConfigPrintHeaderDiv;
-  end;
-
-  iModelGenericProgressBar<T> = interface
-    ['{7442EC82-63F9-44DF-A346-4529556F79EE}']
-    function Background(aValue : string) : iModelGenericProgressBar<T>;
-    function Color(aValue : string) : iModelGenericProgressBar<T>;
-    function DisplayLabel(aValue : Boolean) : iModelGenericProgressBar<T>;
-    function Height(aValue : Integer) : iModelGenericProgressBar<T>; overload;
-    function Height : string; overload;
-    function HTML : String;
-    function Sytle(aValue : TTypeBackgroundColor) : iModelGenericProgressBar<T>;
-    function Value(aValue : string) : iModelGenericProgressBar<T>;
-    function &End : T;
-  end;
-
-  iModelProgress = interface
-    ['{5AEB894D-A80F-4FA2-89E8-EF4EAE6F11DB}']
-    function Height(aValue : integer) : iModelProgress;
-    function HTML : string;
-    function Info : iModelProgressInfo;
-    function ProgressBar : iModelGenericProgressBar<iModelProgress>;
-    function MarginTop(aValue : string) : iModelProgress;
-    function &End : iModelHTML;
-  end;
-
-  iModelProgressInfo = interface
-    ['{33505BD6-334C-4B41-9043-AFE6495B5E2C}']
-    function Icon : iModelProgressInfoIcon;
-    function ResultClass : string;
-    function Title : iModelProgressInfoText;
-    function Value : iModelProgressInfoText;
-    function &End : iModelProgress;
-  end;
-
-  iModelProgressInfoText = interface
-    ['{8EB4A93C-D5B6-42C0-A66C-9B2ECA5832F0}']
-    function Style : iModelGenericStyle<iModelProgressInfoText>;
-    function Text(Value : String) : iModelProgressInfoText; overload;
-    function Text : String; overload;
-    function &End : iModelProgressInfo;
-  end;
-
-  iModelProgressInfoIcon = interface
-    ['{86914363-ED8C-46C6-912B-372855C175F0}']
-    function Icon(Value : String) : iModelProgressInfoIcon; overload;
-    function Icon : String; overload;
-    function Positive(Value : Boolean = true) : iModelProgressInfoIcon;
-    function Style : iModelGenericStyle<iModelProgressInfoIcon>;
-    function Up(Value : Boolean = true) : iModelProgressInfoIcon;
-    function &End : iModelProgressInfo;
-  end;
-//  iLabelLing = interface
-//    function Numeral(Value : String) : iLabelLing;
-//    function Result : String;
-//  end;
-//
-//  iNumeral = interface
-//    function Result(Value : String) : String;
-//  end;
-  IModelHTMLRows = interface
-    ['{684C6EA3-4C2D-4AA9-9A94-BF0A07B14A8B}']
-    function HTML(Value : String) : IModelHTMLRows; overload;
-    function HTML : String; overload;
-    function ID(Value : string) : IModelHTMLRows;
-    function Title : iModelHTMLRowsTitle;
-    function Tag : iModelHTMLRowsTag;
-    {$IFDEF FULL}
-    function _Div : IModelHTMLRowsDiv;
-    function _P : IModelHTMLRowsP;
-    {$ENDIF}
-    function &End : iModelHTML;
-  end;
-  IModelHTMLRowsTag = interface
-    ['{15075847-E7A6-4F18-878D-A7DBCECABE94}']
-    function Add(Value : String) : IModelHTMLRowsTag;
-    function &End : IModelHTMLRows;
-  end;
-  iModelHTMLRowsTitle = interface
-    ['{F2D34927-8232-4A18-944A-DB0ADAD1C903}']
-    function HTML(Value : String) : iModelHTMLRowsTitle; overload;
-    function HTML : String; overload;
-    function Configuracoes : IModelRowsTitleConfig;
-    function Config : IModelRowsTitleConfig;
-    function &End : IModelHTMLRows;
-  end;
-  IModelRowsTitleConfig = interface
-    ['{87031018-5C12-42DF-895F-2602B87FE468}']
-    function H1(Value : String) : IModelRowsTitleConfig; overload;
-    function H1 : String; overload;
-    function H2(Value : String) : IModelRowsTitleConfig; overload;
-    function H2 : String; overload;
-    function H3(Value : String) : IModelRowsTitleConfig; overload;
-    function H3 : String; overload;
-    function H4(Value : String) : IModelRowsTitleConfig; overload;
-    function H4 : String; overload;
-    function H5(Value : String) : IModelRowsTitleConfig; overload;
-    function H5 : String; overload;
-    function &End : iModelHTMLRowsTitle;
-  end;
-  iModelHTMLCharts = interface
-    ['{4CC23536-78BD-40F7-B4A8-D5625E849065}']
-    function _ChartType(Value : TTypeChart) : iModelHTMLChartsGeneric; overload;
-    function _ChartType : TTypeChart; overload;
-    function HTML(Value : String) : iModelHTMLCharts; overload;
-    function HTML : String; overload;
-    function &End : iModelHTML;
-  end;
-  iModelHTMLChartsGeneric = interface
-    ['{83AA6A13-6102-4352-9503-FF9C4AA2C4C7}']
-    function HTML(Value : String) : iModelHTMLChartsGeneric; overload;
-    function HTML : String; overload;
-    function Attributes : iModelHTMLChartsConfig;
-    function &End : iModelHTMLCharts;
-    function UpdateRealTime : iModelHTMLChartsGeneric;
-    function UpdateChart : iModelHTMLChartsGeneric;
-  end;
-  iModelHTMLChartsDoughnut = interface
-    ['{709FF228-7F8A-4E2B-8AB9-EFAEC9AEE1B4}']
-    function SemiCircule ( aValue : Boolean ) : iModelHTMLChartsDoughnut; overload;
-    function HTML(Value : String) : iModelHTMLChartsDoughnut; overload;
-    function HTML : String; overload;
-    function Attributes : iModelHTMLChartsConfig;
-    function &End : iModelHTMLCharts;
-  end;
-  iModelHTMLChartsBar = interface
-    ['{25AE0278-2105-4223-86A9-41F289F75EAE}']
-    function HTML(Value : String) : iModelHTMLChartsBar; overload;
-    function HTML : String; overload;
-    function Attributes : iModelHTMLChartsConfig;
-    function &End : iModelHTMLCharts;
-  end;
-  iModelHTMLChartsLines = interface
-    ['{10DCD4CF-984F-4952-919A-5259A13A9D8D}']
-    function HTML(Value : String) : iModelHTMLChartsLines; overload;
-    function HTML : String; overload;
-    function Attributes : iModelHTMLChartsConfig;
-    function &End : iModelHTMLCharts;
-  end;
-  iModelHTMLChartsLineStacked = interface
-    ['{6A3F3157-8FB2-4D72-A33A-27A66BED2661}']
-    function HTML(Value : String) : iModelHTMLChartsLineStacked; overload;
-    function HTML : String; overload;
-    function Attributes : iModelHTMLChartsConfig;
-    function &End : iModelHTMLCharts;
-  end;
-  iModelHTMLChartsPie = interface
-    ['{470E91C0-58DF-440E-AF3A-445746F0CFE0}']
-    function HTML(Value : String) : iModelHTMLChartsPie; overload;
-    function HTML : String; overload;
-    function Attributes : iModelHTMLChartsConfig;
-    function &End : iModelHTMLCharts;
-  end;
-  iModelHTMLChartsConfig = interface
-    ['{B140654A-10FE-48A2-93B8-3D90743E3F1E}']
-    function Name(Value : String) : iModelHTMLChartsConfig; overload;
-    function Name : String; overload;
-    function IDChart : String;
-    function Labels(Value : String) : iModelHTMLChartsConfig; overload;
-    function Labels : String; overload;
-    function ColSpan(Value : Integer) : iModelHTMLChartsConfig; overload;
-    function ColSpan : Integer; overload;
-    function Width(Value : Integer) : iModelHTMLChartsConfig; overload;
-    function Width : Integer; overload;
-    function Heigth(Value : Integer) : iModelHTMLChartsConfig; overload;
-    function Heigth : Integer; overload;
-    function Data(Value : String) : iModelHTMLChartsConfig; overload;
-    function Data : String; overload;
-    function BackgroundColor(Value : String) : iModelHTMLChartsConfig; overload;
-    function BackgroundColor : String; overload;
-    function DataSet : iModelHTMLDataSet;
-    function ResultDataSet : String;
-    function ResultRealTimeInitialValue : String;
-    function ResultLabels : String;
-    function Stacked(Value : Boolean) : iModelHTMLChartsConfig; overload;
-    function Stacked : Boolean; overload;
-    function CallBackLink(Value : String) : iModelHTMLChartsConfig; overload;
-    function CallBackLink : String; overload;
-    function Labelling : iModelLabellingConfig<iModelHTMLChartsConfig>; overload;
-    function Options : iModelHTMLOptions;
-    function &End : iModelHTMLChartsGeneric;
-  end;
-  iModelHTMLOptions = interface
-    ['{8984AFE4-EBFC-4C97-B7BC-D3DA8FFFB42B}']
-    function SemiCircule ( Value : Boolean ) : iModelHTMLOptions;
-    function Scales : iModelHTMLScales;
-    function Legend : iModelHTMLLegend;
-    function Title : iModelHTMLTitle<iModelHTMLOptions>;
-    function Tooltip : iModelHTMLTooltip<iModelHTMLOptions>;
-    function Plugins : iModelHtmlplugins;
-    function SkipEmptyData(Value : Boolean) : iModelHTMLOptions;
-    function HideLabelEmptyData(Value : Boolean) : iModelHTMLOptions;
-    function Result : String;
-    function &End : iModelHTMLChartsConfig;
-  end;
-  iModelHTMLPlugins = interface
-    ['{55083212-FCFF-4AEC-A1ED-AEFC2C39BB5E}']
-    function Streaming(Value : Boolean) : iModelHTMLPlugins;
-    function Result : String;
-    function &End : iModelHTMLOptions;
-  end;
-  iModelHTMLScales = interface
-    ['{5968D5D3-75C9-4F2C-9E66-3361A92D8DA4}']
-    function GeneratedAxes ( Value : Boolean ) : iModelHTMLScales;
-    function Axes : iModelHTMLChartsAxes;
-    function Result : String;
-    function &End : iModelHTMLOptions;
-  end;
-  iModelHTMLTooltip<T> = interface
-    ['{5968D5D3-75C9-4F2C-9E66-3361A92D8DA4}']
-    function Format(Value : String) : iModelHTMLTooltip<T>;
-    function Enabled(Value : Boolean) : iModelHTMLTooltip<T>;
-    function ToolTipNoScales : iModelHTMLTooltip<T>;
-    function InteractionModeNearest : iModelHTMLTooltip<T>;
-    function InteractionModePoint : iModelHTMLTooltip<T>;
-    function InteractionModeIndex : iModelHTMLTooltip<T>;
-    function InteractionModeDataset : iModelHTMLTooltip<T>;
-    function InteractionModeX : iModelHTMLTooltip<T>;
-    function InteractionModeY : iModelHTMLTooltip<T>;
-    function Intersect(Value : Boolean) : iModelHTMLTooltip<T>;
-    function DisplayTitle(Value : Boolean) : iModelHTMLTooltip<T>;
-    function HideZeroValues(Value : boolean) : iModelHTMLTooltip<T>;
-    function Result : String;
-    function &End : T;
-  end;
-  iModelHTMLTitle<T> = interface
-    ['{21A4474D-87C2-435B-9881-D385518C6EA6}']
-    function display ( Value : Boolean ) :  iModelHTMLTitle<T>; overload;
-    function display : Boolean; overload;
-    function text ( Value : String ) : iModelHTMLTitle<T>; overload;
-    function text : string; overload;
-    function position ( Value : String ) : iModelHTMLTitle<T>; overload;
-    function position : String; overload;
-    function fontSize ( Value : Integer ) : iModelHTMLTitle<T>; overload;
-    function fontSize : Integer; overload;
-    function fontFamily ( Value : String ) : iModelHTMLTitle<T>; overload;
-    function fontFamily : String; overload;
-    function fontColorHEX ( Value : String ) : iModelHTMLTitle<T>; overload;
-    function fontColorHEX : String; overload;
-    function fontStyle ( Value : String ) : iModelHTMLTitle<T>; overload;
-    function fontStyle : String; overload;
-    function padding ( Value : Integer ) : iModelHTMLTitle<T>; overload;
-    function padding : Integer; overload;
-    function Result : String;
-    function &End : T;
-  end;
-  iModelHTMLLegend = interface
-    ['{BC60AEB1-5404-4355-868A-D26BB5A2C773}']
-    function Labels : iModelHTMLLegendLabels<iModelHTMLLegend>;
-    function display ( Value : Boolean ) : iModelHTMLLegend; overload;
-    function display : Boolean; overload;
-    function position ( Value : String ) : iModelHTMLLegend; overload;
-    function position : String; overload;
-    function Result : String;
-    function &End : iModelHTMLOptions;
-  end;
-  iModelHTMLLegendLabels<T> = interface
-    ['{796188B6-4031-43E8-ABF1-43D6C8E1B18D}']
-    function fontSize (Value : Integer) : iModelHTMLLegendLabels<T>; overload;
-    function fontSize : Integer; overload;
-    function fontStyle ( Value : String ) : iModelHTMLLegendLabels<T>; overload;
-    function fontStyle : String; overload;
-    function fontColorHEX ( Value : String ) : iModelHTMLLegendLabels<T>; overload;
-    function fontColorHEX : String; overload;
-    function fontFamily ( Value : String ) : iModelHTMLLegendLabels<T>; overload;
-    function fontFamily : String; overload;
-    function padding ( Value : Integer ) : iModelHTMLLegendLabels<T>; overload;
-    function padding : Integer; overload;
-    function Result : String;
-    function &End : T;
-  end;
-  iModelLabellingConfig<T> = interface
-    ['{4BBEDE9F-9F02-4E92-AFA4-3B301DEC6672}']
-    function Format ( Value : String) : iModelLabellingConfig<T>; overload;
-    function Format : String; overload;
-    function RGBColor ( Value : String ) : iModelLabellingConfig<T>; overload;
-    function RGBColor : String; overload;
-    function FontSize ( Value : Integer) : iModelLabellingConfig<T>; overload;
-    function FontSize : Integer; overload;
-    function FontStyle (Value : String) : iModelLabellingConfig<T>; overload;
-    function FontStyle : String; overload;
-    function FontFamily (Value : String) : iModelLabellingConfig<T>; overload;
-    function FontFamily : String; overload;
-    function HideZeroValues(Value : boolean) : iModelLabellingConfig<T>; overload;
-    function Padding (Value : Integer) : iModelLabellingConfig<T>; overload;
-    function Padding : Integer; overload;
-    function PaddingX (Value : Integer) : iModelLabellingConfig<T>; overload;
-    function PaddingX : Integer; overload;
-    function Result : String;
-    function &End : T;
-  end;
-  iModelHTMLChartsAxes = interface
-    ['{2E97CD69-FDAC-4A01-ADA6-0EA9F1FFFF7C}']
-    function xAxe : iModelHTMLChartsAxesParam;
-    function yAxe : iModelHTMLChartsAxesParam;
-    function Result : String;
-    function &End : iModelHTMLScales;
-  end;
-  iModelHTMLChartsAxesParam = interface
-    ['{E4C5DE93-B372-4D75-ADD2-8A3D1F30223E}']
-    function Ticks : iModelHTMLChartsAxesTicks<iModelHTMLChartsAxesParam>;
-    function GridLines : iModelHTMLChartsAxesGridLines<iModelHTMLChartsAxesParam>;
-    function ScaleLabel : iModelHTMLChatsAxesScaleLabel<iModelHTMLChartsAxesParam>;
-    function Position (Value : String) : iModelHTMLChartsAxesParam; overload;
-    function Position : String; overload;
-    function OffSet (Value : Boolean) : iModelHTMLChartsAxesParam; overload;
-    function OffSet : Boolean; overload;
-    function _Type (Value : String) : iModelHTMLChartsAxesParam; overload;
-    function _Type : String; overload;
-    function RealTime : iModelHTMLChartsAxesParamRealTime;
-    function Stacked ( Value : Boolean ) : iModelHTMLChartsAxesParam; overload;
-    function Stacked : Boolean; overload;
-    function Result : String;
-    function &End : iModelHTMLChartsAxes;
-  end;
-  iModelHTMLChartsAxesParamRealTime = interface
-    ['{448ECDC3-69C1-44F3-B5C5-6C2336F60321}']
-    function Duration (Value : Integer) : iModelHTMLChartsAxesParamRealTime;
-    function Ttl (Value : Integer) : iModelHTMLChartsAxesParamRealTime;
-    function Delay (Value : Integer) : iModelHTMLChartsAxesParamRealTime;
-    function Refresh (Value : Integer) : iModelHTMLChartsAxesParamRealTime;
-    function Result : String;
-    function &End : iModelHTMLChartsAxesParam;
-  end;
-
-  iModelHTMLChatsAxesScaleLabel<T> = interface
-    ['{FC645855-267C-4876-8BE2-EE540732C6A5}']
-    function display (Value : Boolean) : iModelHTMLChatsAxesScaleLabel<T>; overload;
-    function display : Boolean; overload;
-    function labelString ( Value : String ) : iModelHTMLChatsAxesScaleLabel<T>; overload;
-    function labelString : String; overload;
-    function fontColorHEX ( Value : String ) : iModelHTMLChatsAxesScaleLabel<T>; overload;
-    function fontColorHEX  : String; overload;
-    function fontFamily ( Value : String ) : iModelHTMLChatsAxesScaleLabel<T>; overload;
-    function fontFamily : String; overload;
-    function fontSize ( Value : Integer) : iModelHTMLChatsAxesScaleLabel<T>; overload;
-    function fontSize : Integer; overload;
-    function fontStyle ( Value : String) : iModelHTMLChatsAxesScaleLabel<T>; overload;
-    function fontStyle : String; overload;
-    function padding ( Value : Integer ) : iModelHTMLChatsAxesScaleLabel<T>; overload;
-    function padding : Integer; overload;
-    function Result : String;
-    function &End : T;
-  end;
-  iModelHTMLChartsAxesGridLines<T> = interface
-    ['{F9043117-4398-478D-8EA2-8E5E065FB142}']
-    function display (Value : Boolean) : iModelHTMLChartsAxesGridLines<T>; overload;
-    function display : Boolean; overload;
-    function circular (Value : Boolean) : iModelHTMLChartsAxesGridLines<T>; overload;
-    function circular : Boolean; overload;
-    function colorRGBA ( Value : String ) : iModelHTMLChartsAxesGridLines<T>; overload;
-    function colorRGBA : String; overload;
-    function drawBorder ( Value : Boolean ) : iModelHTMLChartsAxesGridLines<T>; overload;
-    function drawBorder : Boolean; overload;
-    function drawOnChartArea ( Value : Boolean) : iModelHTMLChartsAxesGridLines<T>; overload;
-    function drawOnChartArea : Boolean; overload;
-    function drawTicks ( Value : Boolean) : iModelHTMLChartsAxesGridLines<T>; overload;
-    function drawTicks : Boolean; overload;
-    function tickMarkLength ( Value : Integer ) : iModelHTMLChartsAxesGridLines<T>; overload;
-    function tickMarkLength : Integer; overload;
-    function zeroLineWidth ( Value : Integer ) : iModelHTMLChartsAxesGridLines<T>; overload;
-    function zeroLineWidth : Integer; overload;
-    function zeroLineColorRGBA ( Value : String ) : iModelHTMLChartsAxesGridLines<T>; overload;
-    function zeroLineColorRGBA : String; overload;
-    function Result : String;
-    function &End : T;
-  end;
-  iModelHTMLChartsAxesTicks<T> = interface
-    ['{C56445FE-00C6-47E1-8B38-F0FE57419A71}']
-    function fontColor (Value : String) : iModelHTMLChartsAxesTicks<T>; overload;
-    function fontColor : String; overload;
-    function fontSize (Value : integer) : iModelHTMLChartsAxesTicks<T>; overload;
-    function fontSize : integer; overload;
-    function fontFamily (Value : string) : iModelHTMLChartsAxesTicks<T>; overload;
-    function fontFamily : string; overload;
-    function autoSkip (Value : Boolean) : iModelHTMLChartsAxesTicks<T>; overload;
-    function autoSkip : Boolean; overload;
-    function autoSkipPadding (Value : Integer) : iModelHTMLChartsAxesTicks<T>; overload;
-    function autoSkipPadding : Integer; overload;
-    function labelOffset (Value : Integer) : iModelHTMLChartsAxesTicks<T>; overload;
-    function labelOffset : Integer; overload;
-    function maxRotation (Value : Integer) : iModelHTMLChartsAxesTicks<T>; overload;
-    function maxRotation : Integer; overload;
-    function minRotation (Value : Integer) : iModelHTMLChartsAxesTicks<T>; overload;
-    function minRotation : Integer; overload;
-    function mirror ( Value : Boolean) : iModelHTMLChartsAxesTicks<T>; overload;
-    function mirror : Boolean; overload;
-    function padding ( Value : Integer) : iModelHTMLChartsAxesTicks<T>; overload;
-    function padding : Integer; overload;
-    function format ( Value : String) : iModelHTMLChartsAxesTicks<T>; overload;
-    function format : String; overload;
-    function BeginAtZero (Value : Boolean) : iModelHTMLChartsAxesTicks<T>;
-    function Max ( Value : String) : iModelHTMLChartsAxesTicks<T>;
-    function Min( Value : String) : iModelHTMLChartsAxesTicks<T>;
-    function StepSize ( Value : String) : iModelHTMLChartsAxesTicks<T>;
-    function SuggestedMin ( Value : String) : iModelHTMLChartsAxesTicks<T>;
-    function SuggestedMax ( Value : String) : iModelHTMLChartsAxesTicks<T>;
-    function MaxTicksLimit ( Value : String) : iModelHTMLChartsAxesTicks<T>;
-    function Result : String;
-    function &End : T;
-  end;
-  iModelHTMLDataSet = interface
-    ['{761961EF-0C2B-4B88-AC8F-B4806D530D07}']
-    function DataSet (Value : TDataSet) : iModelHTMLDataSet;
-    function RealTimeDataSet (Value : TDataSet) : iModelHTMLDataSet;
-    function LabelName(Value : String) : iModelHTMLDataSet;
-    function ValueName(Value : String) : iModelHTMLDataSet;
-    function RGBName(Value : String)  : iModelHTMLDataSet;
-    function textLabel(Value : String) : iModelHTMLDataSet;
-    function BackgroundColor (Value : String) : iModelHTMLDataSet;
-    function BackgroundOpacity(Value : Integer) : iModelHTMLDataSet;
-    function BorderColor (Value : String) : iModelHTMLDataSet;
-    function BorderOpacity(Value : Integer) : iModelHTMLDataSet;
-    function BorderWidth (Value : Integer) : iModelHTMLDataSet;
-    function BorderDash (Lenght : Integer; Space : Integer) : iModelHTMLDataSet;
-    function Data (Value : String) : iModelHTMLDataSet;
-    function Fill (Value : Boolean) : iModelHTMLDataSet;
-    function LineTension (Value : Integer) : iModelHTMLDataSet;
-    function ResultScript : String;
-    function ResultLabels : String;
-    function RealTimeInitialValue : String;
-    function Types (Value : String) : iModelHTMLDataSet;
-    function Hidden(Value : Boolean) : iModelHTMLDataSet;
-    function HideZeroValuesControl(Value : Boolean) : iModelHTMLDataSet;
-    function &End : iModelHTMLChartsConfig;
-  end;
-  iModelHTMLFactory = interface
-    ['{8CF35864-C906-4B8B-AC69-CD2F2001D906}']
-    function HTML : iModelHTML;
-    function Charts(Parent : iModelHTML) : iModelHTMLCharts;
-    function Rows(Parent : iModelHTML) : IModelHTMLRows;
-    function RowsTitle(Parent : IModelHTMLRows) : iModelHTMLRowsTitle;
-    {$IFDEF FULL}
-    function Table(Parent : iModelHTML) : iModelTable;
-    function Cards(Parent : iModelHTML) : iModelCards;
-    function Image(Parent : iModelHTML) : iModelImage;
-    function ChartEasyPie(Parent : iModelHTML) : iModelChartEasyPie;
-    {$ENDIF}
-  end;
-  iModelColors<T> = interface
-    ['{8A6FA48B-BCB6-468B-A6EC-BC582B898E16}']
-    function Primary : iModelColors<T>;
-    function Secondary : iModelColors<T>;
-    function Success : iModelColors<T>;
-    function Danger : iModelColors<T>;
-    function Warning : iModelColors<T>;
-    function Info : iModelColors<T>;
-    function Light : iModelColors<T>;
-    function Dark : iModelColors<T>;
-    function Result : String;
-    function &End : T;
-  end;
-  iModelJumbotron = interface
-    ['{90EB606E-886D-4333-ADD4-3A723A4F989B}']
-    function Title(Value : String) : iModelJumbotron;
-    function Description(Value : String) : iModelJumbotron;
-    function &End : iModelHTML;
-  end;
-  iModelAlerts = interface
-    ['{F6967759-446A-42EF-9459-DE04C83BB65B}']
-    function Title(Value : String) : iModelAlerts;
-    function AlertsClass : iModelAlertsClass;
-    function &End : iModelHTML;
-  end;
-  iModelAlertsClass = interface
-    ['{B877835D-FABB-4E0E-A44D-72DEC61B098B}']
-    function primary : iModelAlertsClass;
-    function secondary : iModelAlertsClass;
-    function success : iModelAlertsClass;
-    function danger : iModelAlertsClass;
-    function warning : iModelAlertsClass;
-    function info : iModelAlertsClass;
-    function light : iModelAlertsClass;
-    function dark : iModelAlertsClass;
-    function ResultClass : String;
-    function &End : iModelAlerts;
-  end;
-
-  iModelGenericDataSet<T> = interface
-    ['{761961EF-0C2B-4B88-AC8F-B4806D530D07}']
-    function DataSet (Value : TDataSet) : iModelGenericDataSet<T>; overload;
-    function LabelName(Value : String) : iModelGenericDataSet<T>; overload;
-    function ValueName(Value : String) : iModelGenericDataSet<T>; overload;
-    function RGBName(Value : String)  : iModelGenericDataSet<T>; overload;
-//    function textLabel(Value : String) : iModelGenericDataSet<T>;
-//    function BackgroundColor (Value : String) : iModelGenericDataSet<T>;
-//    function BorderColor (Value : String) : iModelGenericDataSet<T>;
-//    function BorderWidth (Value : Integer) : iModelGenericDataSet<T>;
-//    function Data (Value : String) : iModelGenericDataSet<T>;
-//    function Fill (Value : Boolean) : iModelGenericDataSet<T>;
-//    function ResultLabels : String;
-//    function Types (Value : String) : iModelGenericDataSet<T>;
-    function CallbackLink(Field : String; MethodName : String) : iModelGenericDataSet<T>; overload;
-    function CallbackLink: TDictionary<String, String>; overload;
-    function &End : T;
-    function DataSet : TDataSet; overload;
-    function ValueName : String; overload;
-    function LabelName : String; overload;
-    function RGBName : String; overload;
-    function DataSetJstringify : string;
- end;
-  iModelListGroup = interface
-    ['{4E7BC346-00A5-4B5C-92A2-348107CFEADA}']
-    function ListGroupType : iModelListGroupClass;
-    function DataSet : iModelGenericDataSet<iModelListGroup>;
-    function &End : iModelHTML;
-  end;
-  iModelListGroupClass = interface
-    ['{9DE42B06-A698-437D-B25D-2A6CB8A9B409}']
-    function Basic : iModelListGroupClass;
-    function Flush : iModelListGroupClass;
-    function Action : iModelListGroupClass;
-    function Horizontal : iModelListGroupClass;
-    function TagIn : String;
-    function ElementIn : String;
-    function ElementOut : String;
-    function ClassType : String;
-    function &End : iModelListGroup;
-  end;
-  iModelGenericList<T> = interface
-    ['{BCF34A04-11DC-437B-BACA-97FBB4F0C7AF}']
-    function Add(Value : string) : iModelGenericList<T>;
-    function List : TList<String>;
-    function &End : T;
-  end;
-
-  iModelPivotTableConfig = interface
-    ['{B5F32DE7-8BEA-40B3-92B6-5AD7EA2BB3FE}']
-    function ConfigBackgroundColor(Value : string) : iModelPivotTableConfig;
-    function ConfigHeadStyle : iModelGenericStyle<iModelPivotTableConfig>;
-    function ConfigBodyStyle : iModelGenericStyle<iModelPivotTableConfig>;
-    function PivotOptions(Value : string) : iModelPivotTableConfig; overload;
-    function DataSet : iModelGenericDataSet<iModelPivotTableConfig>;
-    function Rows : iModelGenericList<iModelPivotTableConfig>;
-    function Cols : iModelGenericList<iModelPivotTableConfig>;
-    function &End : iModelPivotTable;
-    function PivotType : iModelPivotTableClass;
-    function ShowPivotUI(Value : Boolean) : iModelPivotTableConfig; overload;
-    function PivotOptions : string; overload;
-    function ShowPivotUI : string; overload;
-    function ResultStyle : string;
-    function ResultData : string;
-  end;
-
-  iModelJSCommand = interface
-    ['{60141CC4-A117-4500-B28E-C09B2339E6B8}']
-    function Command(Value : string) :iModelJSCommand;
-    function Paramters : iModelGenericList<iModelJSCommand>; overload;
-    function TagName(Value : string) :iModelJSCommand; overload;
-    function TagID(Value : string) : iModelJSCommand; overload;
-    function TagAttribute(Value : string) : iModelJSCommand; overload;
-    function Callback(Value : TProc<String>) : iModelJSCommand; overload;
-    function TestBeforeExecute(Value : Boolean) : iModelJSCommand;
-    function ResultCommand : string; overload;
-    function TagName : string; overload;
-    function TagID : string; overload;
-    function TagAttribute : string; overload;
-    function Callback : TProc<String>; overload;
-  end;
-
-  iModelPivotTable = interface
-    ['{D9C25BD4-9C5F-4F8C-AFA7-D251193609A9}']
-    function Attributes : iModelPivotTableConfig;
-    function SaveConfig : string; overload;
-    function SaveConfig(Value : TProc<String>) : iModelPivotTable; overload;
-    function LoadConfig(Value : string) : iModelPivotTable;
-    function ShowUI : iModelPivotTable;
-    function HideUI : iModelPivotTable;
-    function &End : iModelHTML;
-  end;
-
-  iModelPivotTableClass = interface
-    ['{B5695B31-A3C9-45A4-86D8-3542736EC848}']
-    function Tabela : iModelPivotTableClass;
-    function TabelaComBarras : iModelPivotTableClass;
-    function MapaDeCalor : iModelPivotTableClass;
-    function MapaDeCalorPorLinhas : iModelPivotTableClass;
-    function MapaDeCalorPorColunas : iModelPivotTableClass;
-    function BarrasHorizontais : iModelPivotTableClass;
-    function BarrasHorizontaisEmpilhadas : iModelPivotTableClass;
-    function GraficoDeBarras : iModelPivotTableClass;
-    function GraficoDeBarrasEmpilhadas : iModelPivotTableClass;
-    function GraficoDeLinhas : iModelPivotTableClass;
-    function GraficoDeArea : iModelPivotTableClass;
-    function GraficoDePizzaMultiplo : iModelPivotTableClass;
-    function ResultClass : string;
-    function &End : iModelPivotTableConfig;
-  end;
-
-  iModelGenericStyle<T> = interface
-  ['{C98A4A18-4BA5-45E1-B442-0D728E7138E3}']
-    function AlignItems(Value : String) : iModelGenericStyle<T>; overload;
-    function AlignItems : string; overload;
-    function Background(Value : string) : iModelGenericStyle<T>; overload;
-    function Background : string; overload;
-    function BackgroundColor(Value : string) : iModelGenericStyle<T>; overload;
-    function BackgroundColor : string; overload;
-    function Color(Value : string) : iModelGenericStyle<T>; overload;
-    function Color : string; overload;
-    function Display(Value : String) : iModelGenericStyle<T>; overload;
-    function Display : string; overload;
-    function FontFamily(Value : String) : iModelGenericStyle<T>; overload;
-    function FontFamily : string; overload;
-    function FontSize(Value : Integer) : iModelGenericStyle<T>; overload;
-    function FontSize(Value : string) : iModelGenericStyle<T>; overload;
-    function FontSize : string; overload;
-    function FontWeight(Value : String) : iModelGenericStyle<T>; overload;
-    function FontWeight : string; overload;
-    function Height(Value : Integer) : iModelGenericStyle<T>; overload;
-    function Height(Value : String) : iModelGenericStyle<T>; overload;
-    function Height : string; overload;
-    function JustifyContent(Value : String) : iModelGenericStyle<T>; overload;
-    function JustifyContent : string; overload;
-    function Padding(Value : Integer) : iModelGenericStyle<T>; overload;
-    function Padding(Value : String) : iModelGenericStyle<T>; overload;
-    function Padding : string; overload;
-    function TextAlign(Value : String) : iModelGenericStyle<T>; overload;
-    function TextAlign : string; overload;
-    function Width(Value : Integer) : iModelGenericStyle<T>; overload;
-    function Width(Value : String) : iModelGenericStyle<T>; overload;
-    function Width : string; overload;
-    function LineHeight(Value : string) : iModelGenericStyle<T>; overload;
-    function LineHeight(Value : Integer) : iModelGenericStyle<T>; overload;
-    function LineHeight : string; overload;
-    function MarginLeft(Value : Integer) : iModelGenericStyle<T>; overload;
-    function MarginLeft(Value : string) : iModelGenericStyle<T>; overload;
-    function MarginLeft : string; overload;
-    function Position(Value : string) : iModelGenericStyle<T>; overload;
-    function Position : string; overload;
-    function Right(Value : Integer) : iModelGenericStyle<T>; overload;
-    function Right(Value : string) : iModelGenericStyle<T>; overload;
-    function Right : string; overload;
-    function Top(Value : Integer) : iModelGenericStyle<T>; overload;
-    function Top(Value : string) : iModelGenericStyle<T>; overload;
-    function Top : string; overload;
-    function VerticalAlign(Value : string) : iModelGenericStyle<T>; overload;
-    function VerticalAlign : string; overload;
-    function Opacity(Value : string) : iModelGenericStyle<T>; overload;
-    function Opacity : string; overload;
-    function ResultStyle : String;
-    function &End : T;
-  end;
-
-  iModelGenericCoordinates<T> = interface
-    ['{AE9131DA-6C0D-4A8F-876F-9D86EA6794E7}']
-    function Latitude(Value : string) : iModelGenericCoordinates<T>; overload;
-    function Longitude(Value : string) : iModelGenericCoordinates<T>; overload;
-    function Latitude : string; overload;
-    function Longitude : string; overload;
-    function &End : T;
-  end;
-  {$IFDEF FULL}
-  IModelHTMLRowsP = interface
-    ['{F26E4162-73CC-40E9-8E35-9499B6D61673}']
-    function _Class(Value : String) : IModelHTMLRowsP;
-    function ID(Value : string) : IModelHTMLRowsP;
-    function Add(Value : String) : iModelHTMLRowsP;
-    function &End : IModelHTMLRows;
-  end;
-  iModelTable = interface
-    ['{D0151987-64C8-40E2-A83C-18AF9648F8AE}']
-    function &End : iModelHTML;
-    function DataSet : iModelTableDataSet;
-    function TableClass : iModelTableClass;
-    function TableOptions : iModelTableOption;
-    function TableFeatures : iModelTableFeatures;
-    function TableData : iModelTableData;
-    function Datatable(Value : Boolean) : iModelTable;
-  end;
-  iModelTableClass = interface
-    ['{AC891435-E424-4C9D-BC69-4B05A705B96E}']
-    function tableDark : iModelTableClass;
-    function tableStriped : iModelTableClass;
-    function tableBordered : iModelTableClass;
-    function tableHover : iModelTableClass;
-    function tableSm : iModelTableClass;
-    function tableResponsive : iModelTableClass;
-    function &EndTableClass : iModelTable;
-  end;
-  iModelTableDataSet = interface
-    ['{061B2938-6100-42AF-8EE4-D5895E5A38B8}']
-    function DataSet (Value : TDataSet) : iModelTableDataSet;
-    function CallbackLink(Field : String; MethodName : String) : iModelTableDataSet; overload;
-    function CallbackLink(Field : String; MethodName : String; AValue : String) : iModelTableDataSet; overload;
-    function Action : iModelTableAction;
-    function ActionEdit : iModelTableAction;
-    function ActionDelete : iModelTableAction;
-    function ResultScript : String;
-    function ResultStyle : String;
-    function &End : iModelTable;
-  end;
-  iModelTableActionImage = Interface
-    ['{60D2D1F0-B0F7-404D-8681-B9EBE36FFEB2}']
-    function Image (Value : TCustomMemoryStream) : iModelTableActionImage; overload;
-    function Image (Value : String) : iModelTableActionImage; overload;
-    function Width (Value : Integer) : iModelTableActionImage; overload;
-    function Height (Value : Integer) : iModelTableActionImage; overload;
-    function Tooltip (Value : String) : iModelTableActionImage; overload;
-    function Image : String; overload;
-    function Width : String; overload;
-    function Height : String; overload;
-    function Tooltip : String overload;
-    function StyleClass : String;
-    function &End : iModelTableAction;
-  end;
-  iModelTableAction = interface
-    ['{D9476DEA-F074-4A7B-9472-B7A9872F7023}']
-    function ActionHeader (Value : String) : iModelTableAction; overload;
-    function Image : iModelTableActionImage;
-    function CallbackLink(Field : String; MethodName : String) : iModelTableAction;
-    function ActionHeader : String; overload;
-    function ImageTag : String;
-    function MethodName : String;
-    function FieldName : String;
-    function ResultStyle : String;
-    function &End : iModelTableDataSet;
-  end;
-  iModelTableOption = interface
-    ['{2DFF85D5-1116-4160-AAE4-8A5172B8EFD8}']
-    function ScrollCollapse(Value : Boolean) : iModelTableOption; //Permita que a tabela reduza em altura quando um número limitado de linhas for mostrado.
-    function Responsive(Value : Boolean) : iModelTableOption; //Habilitar e configurar a extensão responsiva para DataTables
-    function DeferLoading(Value : Integer) : iModelTableOption; //Atraso no carregamento dos dados do servidor até o segundo sorteio
-    function OpDestroy(Value : Boolean) : iModelTableOption; //Destrua qualquer tabela existente que corresponda ao seletor e substitua pelas novas opções.
-    function DisplayStart(Value : Integer) : iModelTableOption; //Ponto inicial de paginação inicial
-    function LengthMenu(Value : String) : iModelTableOption; //Altere as opções na selectlista de comprimento da página .
-    function Order(Value : String) : iModelTableOption; //Ordem inicial (classificação) a ser aplicada à tabela
-    function OrderCellsTop(Value : Boolean) : iModelTableOption; //Controlar em qual célula o manipulador de eventos do pedido será aplicado em uma coluna
-    function OrderClasses(Value : Boolean) : iModelTableOption; //Destaque as colunas que estão sendo ordenadas no corpo da tabela
-    function OrderFixed(Value : String) : iModelTableOption; //Ordenação para sempre ser aplicada à tabela
-    function OrderMulti(Value : Boolean) : iModelTableOption; //Controle de capacidade de ordenação de várias colunas.
-    function PageLength(Value : Integer) : iModelTableOption; //Alterar o comprimento da página inicial (número de linhas por página)
-    function PagingType(Value : String) : iModelTableOption; //Opções de exibição do botão de paginação
-    function Retrieve(Value : Boolean) : iModelTableOption; //Recuperar uma instância existente do DataTables
-    function Name(Value : String) : iModelTableOption; overload;//DOM Id
-    function Name: String; overload;//DOM Id
-    function Result : String;
-    function &End : iModelTable;
-  end;
-  iModelTableFeatures = interface
-    ['{3A297833-19EA-46CB-A10D-5AF1905791FC}']
-    function AutoWidth(Value : Boolean) : iModelTableFeatures; //Controle de recursos Tratamento de largura de colunas inteligentes do DataTables
-    function deferRender(Value : Boolean) : iModelTableFeatures; //Controle diferenciado renderização adiada para velocidade adicional de inicialização.
-    function Info(Value : Boolean) : iModelTableFeatures; //Campo de exibição de informações da tabela de controle de recursos
-    function LengthChange(Value : Boolean) : iModelTableFeatures; //O recurso controla a capacidade do usuário final de alterar o comprimento da exibição de paginação da tabela.
-    function Ordering(Value : Boolean) : iModelTableFeatures; //Recursos de ordenação de controle de recursos (classificação) no DataTables.
-    function Paging(Value : Boolean) : iModelTableFeatures; //Ativar ou desativar a paginação da tabela
-    function Processing(Value : Boolean) : iModelTableFeatures; //O recurso controla o indicador de processamento
-    function ScrollX(Value : Boolean) : iModelTableFeatures; //rolagem horizontal
-    function ScrollY(Value : Integer) : iModelTableFeatures; //rolagem vertical
-    function Searching(Value : Boolean) : iModelTableFeatures; //Recursos de pesquisa (filtragem) de controle de recursos
-    function ServerSide(Value : Boolean) : iModelTableFeatures; //Controle de recurso Modo de processamento no lado do servidor do DataTables
-    function StateSave(Value : Boolean) : iModelTableFeatures; //Economia de estado - restaura o estado da tabela no recarregamento da página.
-    function Result : String;
-    function &End : iModelTable;
-  end;
-  iModelTableData = interface
-    ['{6241E52E-02AF-4395-B162-6FF6B5821A6C}']
-    function Server(Value : String) : iModelTableData;
-    function Columns(Value : Array of String) : iModelTableData;
-    function JType(Value : String) : iModelTableData;
-    function DataSrc(Value : String) : iModelTableData;
-    function ResultTable : String;
-    function Result : String;
-    function &End : iModelTable;
-  end;
-  iModelTableCallback = interface
-    ['{CB685C9B-1FC8-4C23-BECC-BFCBBAA99C37}']
-    function formatNumber(aCampo, aFormat : String) : iModelTableCallback;
-    function Result : String;
-    function &End : iModelTable;
-  end;
-  IModelHTMLRowsDiv = interface
-    ['{BD95F279-9614-47FD-B0AD-56B93279D4F1}']
-    function Add(Value : String) : IModelHTMLRowsDiv;
-    function ColSpan(Value : Integer) : IModelHTMLRowsDiv;
-    function ID(Value : string) : IModelHTMLRowsDiv;
-    function &End : IModelHTMLRows;
-  end;
-  iModelCards = interface
-    ['{5BA3AF40-D673-44BA-BF79-5F35E0F00BFB}']
-    function Colors : iModelColors<iModelCards>;
-    function DataSet : iModelCardsDataSet;
-    function FieldHeader(Value : String) : iModelCards; overload;
-    function FieldTitle(Value : String) : iModelCards; overload;
-    function FieldBody(Value : String) : iModelCards; overload;
-    function FieldHeader : String; overload;
-    function FieldTitle : String; overload;
-    function FieldBody : String; overload;
-    function ColSpan(Value : Integer) : iModelCards; overload;
-    function ColSpan : Integer; overload;
-    function &End : iModelHTML;
-  end;
-  iModelCardsDataSet = interface
-    ['{E38197FC-8395-45BC-A0DE-D7283DD7E594}']
-    function DataSet (Value : TDataSet) : iModelCardsDataSet;
-    function ResultScript : String;
-    function &End : iModelCards;
-  end;
-  iCallbackJS = interface
-    ['{B3DD9B36-2024-4763-96A3-DEC0F10F454A}']
-    function ClassProvider(Value : TObject) : iCallbackJS;
-    function &End : iModelHTML;
-  end;
-  iChartsCallback = interface
-  ['{4040F646-6D4F-477A-B5CE-98FDD025DAEB}']
-    function Result (Value : String) : String;
-    function IDChart ( Value : String) : iChartsCallback;
-  end;
-  iModelImage = interface
-    ['{477D75E4-1BEE-4E4B-B15F-80B92DA186EA}']
-    function &End : iModelHTML;
-    function ImageClass : iModelImageClass;
-    function DataSet : iModelImageDataSet;
-  end;
-  iModelImageDataSet = interface
-    ['{061B2938-6100-42AF-8EE4-D5895E5A38B8}']
-    function Field(Value : String) : iModelImageDataSet;
-    function DataSet (Value : TDataSet) : iModelImageDataSet;
-    function ResultScript : String;
-    function &End : iModelImage;
-  end;
-  iModelImageClass = interface
-    ['{9631B98F-CDE7-41A1-8138-E8E05AD72B65}']
-    function imgFluid : iModelImageClass;
-    function imgThumbnail : iModelImageClass;
-    function FloatLeft : iModelImageClass;
-    function FloatRight : iModelImageClass;
-    function MxAuto : iModelImageClass;
-    function DBlock : iModelImageClass;
-    function rounded : iModelImageClass;
-    function ResultClass : String;
-    function &End : iModelImage;
-  end;
-  iModelButton = interface
-    ['{BF6585F7-1823-4604-8FE4-1305EF38833B}']
-    function ButtonClass : iModelButtonClass;
-    function CallbackLink(Param : String; Method : String) : iModelButton;
-    function Title(Value : String) : iModelButton;
-    function &End : iModelHTML;
-  end;
-  iModelButtonClass = interface
-  ['{E03B3D3A-2D23-4AC0-86E3-5C4F18B9A9CE}']
-    function primary : iModelButtonClass;
-    function secondary : iModelButtonClass;
-    function success : iModelButtonClass;
-    function danger : iModelButtonClass;
-    function warning : iModelButtonClass;
-    function info : iModelButtonClass;
-    function light : iModelButtonClass;
-    function dark : iModelButtonClass;
-    function outline : iModelButtonClass;
-    function small : iModelButtonClass;
-    function large : iModelButtonClass;
-    function block : iModelButtonClass;
-    function active : iModelButtonClass;
-    function disabled : iModelButtonClass;
-    function ResultClass : String;
-    function &End : iModelButton;
-  end;
-  iModelCSS = interface
-    ['{DBC52618-B95B-4871-9BC5-632B7737F2FD}']
-    function PackCSS : String;
-    function CDN(Value : Boolean) : iModelCSS;
-    function BackgroundColor ( Value : String ) :  iModelCSS;
-    function FontColor ( Value : String ) : iModelCSS;
-    function BorderColor ( Value : String ) : iModelCSS;
-  end;
-  iModelJS = interface
-    ['{CB37AC61-A8D6-4CEB-BFD1-FDC26CDEB2AA}']
-    function PackJS : String;
-    function CDN(Value : Boolean) : iModelJS;
-    function Credenciais(Value : iModelCredenciais) : iModelJS;
-  end;
-  iModelChartEasyPie = interface
-    ['{236E2A17-A50A-4E23-A414-19A1E8A7B34E}']
-    function BarColor(Value : String) : iModelChartEasyPie;
-    function TrackColor(Value : String) : iModelChartEasyPie;
-    function ScaleColor(Value : String) : iModelChartEasyPie;
-    function LineCap(Value : String) : iModelChartEasyPie;
-    function LinheWidth(Value : String) : iModelChartEasyPie;
-    function Size(Value : String) : iModelChartEasyPie;
-    function Animate(Value : String) : iModelChartEasyPie;
-    function OnStart(Value : String) : iModelChartEasyPie;
-    function OnStop(Value : String) : iModelChartEasyPie;
-    function OnStep(Value : String) : iModelChartEasyPie;
-    function DataPercent(Value : String) : iModelChartEasyPie;
-    function &End : iModelHTML;
-  end;
-  {$ENDIF}
-implementation
-end.
diff --git a/Sample/Horse/TBGWebCharts_Horse.dproj b/Sample/Horse/TBGWebCharts_Horse.dproj
index 5b27739..2287901 100644
--- a/Sample/Horse/TBGWebCharts_Horse.dproj
+++ b/Sample/Horse/TBGWebCharts_Horse.dproj
@@ -47,7 +47,7 @@
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
         <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
-        <DCC_UnitSearchPath>..\..\;modules\.dcp;modules\.dcu;modules;modules\horse\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\TBGWebCharts\Source;..\..\..\TBGWebCharts\Source\Include;..\..\..\TBGWebCharts\Source\Browser;..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\TBGWebCharts\Source\Charts;..\..\..\TBGWebCharts\Source\Generic;..\..\..\TBGWebCharts\Source\Maps;..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\TBGWebCharts\Source\Rows;..\..\..\TBGWebCharts\Source\Table;.\modules\horse\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
     </PropertyGroup>
diff --git a/Sample/Utils/Callback Manual/CallbackManual.dproj b/Sample/Utils/Callback Manual/CallbackManual.dproj
index 2eb688b..72652c8 100644
--- a/Sample/Utils/Callback Manual/CallbackManual.dproj	
+++ b/Sample/Utils/Callback Manual/CallbackManual.dproj	
@@ -58,7 +58,7 @@
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
         <SanitizedProjectName>CallbackManual</SanitizedProjectName>
-        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts\Source;..\..\..\..\TBGWebCharts\Source\Include;..\..\..\..\TBGWebCharts\Source\Browser;..\..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\..\TBGWebCharts\Source\Charts;..\..\..\..\TBGWebCharts\Source\Generic;..\..\..\..\TBGWebCharts\Source\Maps;..\..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\..\TBGWebCharts\Source\Rows;..\..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <VerInfo_Locale>1040</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
diff --git a/Sample/Utils/Geracao Dinamica de Charts/GeracaoChartsDinamico.dproj b/Sample/Utils/Geracao Dinamica de Charts/GeracaoChartsDinamico.dproj
index 620bc2b..0fd27fb 100644
--- a/Sample/Utils/Geracao Dinamica de Charts/GeracaoChartsDinamico.dproj	
+++ b/Sample/Utils/Geracao Dinamica de Charts/GeracaoChartsDinamico.dproj	
@@ -58,7 +58,7 @@
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
         <SanitizedProjectName>GeracaoChartsDinamico</SanitizedProjectName>
-        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts\Source;..\..\..\..\TBGWebCharts\Source\Include;..\..\..\..\TBGWebCharts\Source\Browser;..\..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\..\TBGWebCharts\Source\Charts;..\..\..\..\TBGWebCharts\Source\Generic;..\..\..\..\TBGWebCharts\Source\Maps;..\..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\..\TBGWebCharts\Source\Rows;..\..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <VerInfo_Locale>1040</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
diff --git a/Sample/VCL/DashBoardCards/DashBoardCards.dproj b/Sample/VCL/DashBoardCards/DashBoardCards.dproj
index c1101ee..d66429b 100644
--- a/Sample/VCL/DashBoardCards/DashBoardCards.dproj
+++ b/Sample/VCL/DashBoardCards/DashBoardCards.dproj
@@ -58,7 +58,7 @@
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
         <SanitizedProjectName>DashBoardCards</SanitizedProjectName>
-        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts\Source;..\..\..\..\TBGWebCharts\Source\Include;..\..\..\..\TBGWebCharts\Source\Browser;..\..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\..\TBGWebCharts\Source\Charts;..\..\..\..\TBGWebCharts\Source\Generic;..\..\..\..\TBGWebCharts\Source\Maps;..\..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\..\TBGWebCharts\Source\Rows;..\..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <VerInfo_Locale>1040</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
diff --git a/Sample/VCL/DashBoardCards2/DashBoardCards2.dproj b/Sample/VCL/DashBoardCards2/DashBoardCards2.dproj
index ba94960..cd57e3e 100644
--- a/Sample/VCL/DashBoardCards2/DashBoardCards2.dproj
+++ b/Sample/VCL/DashBoardCards2/DashBoardCards2.dproj
@@ -56,7 +56,7 @@
         <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <VerInfo_Locale>1040</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts\Source;..\..\..\..\TBGWebCharts\Source\Include;..\..\..\..\TBGWebCharts\Source\Browser;..\..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\..\TBGWebCharts\Source\Charts;..\..\..\..\TBGWebCharts\Source\Generic;..\..\..\..\TBGWebCharts\Source\Maps;..\..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\..\TBGWebCharts\Source\Rows;..\..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
     </PropertyGroup>
@@ -98,6 +98,7 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
diff --git a/Sample/VCL/Dashboard Black/BlackDashboard.dproj b/Sample/VCL/Dashboard Black/BlackDashboard.dproj
index 1a80e4b..220de5f 100644
--- a/Sample/VCL/Dashboard Black/BlackDashboard.dproj	
+++ b/Sample/VCL/Dashboard Black/BlackDashboard.dproj	
@@ -58,6 +58,7 @@
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
+        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts\Source;..\..\..\..\TBGWebCharts\Source\Include;..\..\..\..\TBGWebCharts\Source\Browser;..\..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\..\TBGWebCharts\Source\Charts;..\..\..\..\TBGWebCharts\Source\Generic;..\..\..\..\TBGWebCharts\Source\Maps;..\..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\..\TBGWebCharts\Source\Rows;..\..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -85,8 +86,10 @@
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -96,7 +99,6 @@
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
diff --git a/Sample/VCL/Demo_Old/TBGWebCharts_VCL.dproj b/Sample/VCL/Demo_Old/TBGWebCharts_VCL.dproj
index b0b2356..b913011 100644
--- a/Sample/VCL/Demo_Old/TBGWebCharts_VCL.dproj
+++ b/Sample/VCL/Demo_Old/TBGWebCharts_VCL.dproj
@@ -56,7 +56,7 @@
         <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
         <VerInfo_Locale>1046</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts\Source;..\..\..\..\TBGWebCharts\Source\Include;..\..\..\..\TBGWebCharts\Source\Browser;..\..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\..\TBGWebCharts\Source\Charts;..\..\..\..\TBGWebCharts\Source\Generic;..\..\..\..\TBGWebCharts\Source\Maps;..\..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\..\TBGWebCharts\Source\Rows;..\..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
     </PropertyGroup>
diff --git a/Sample/VCL/Geracao de DataSet Dinamicos/GeracaoDataSetDinamico.dproj b/Sample/VCL/Geracao de DataSet Dinamicos/GeracaoDataSetDinamico.dproj
index 46a4dd2..6037fc3 100644
--- a/Sample/VCL/Geracao de DataSet Dinamicos/GeracaoDataSetDinamico.dproj	
+++ b/Sample/VCL/Geracao de DataSet Dinamicos/GeracaoDataSetDinamico.dproj	
@@ -98,6 +98,8 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts\Source;..\..\..\..\TBGWebCharts\Source\Include;..\..\..\..\TBGWebCharts\Source\Browser;..\..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\..\TBGWebCharts\Source\Charts;..\..\..\..\TBGWebCharts\Source\Generic;..\..\..\..\TBGWebCharts\Source\Maps;..\..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\..\TBGWebCharts\Source\Rows;..\..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
diff --git a/Sample/VCL/RichTextEditor/Sample_RichTextEditor.dproj b/Sample/VCL/RichTextEditor/Sample_RichTextEditor.dproj
index 33035cd..03f6487 100644
--- a/Sample/VCL/RichTextEditor/Sample_RichTextEditor.dproj
+++ b/Sample/VCL/RichTextEditor/Sample_RichTextEditor.dproj
@@ -58,7 +58,7 @@
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
         <SanitizedProjectName>Sample_RichTextEditor</SanitizedProjectName>
-        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts\Source;..\..\..\..\TBGWebCharts\Source\Include;..\..\..\..\TBGWebCharts\Source\Browser;..\..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\..\TBGWebCharts\Source\Charts;..\..\..\..\TBGWebCharts\Source\Generic;..\..\..\..\TBGWebCharts\Source\Maps;..\..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\..\TBGWebCharts\Source\Rows;..\..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <VerInfo_Locale>1040</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
diff --git a/Sample/VCL/TBGWebCharts_VLC_Demo/TBGWebCharts_VCL_Demo.dpr b/Sample/VCL/TBGWebCharts_VLC_Demo/TBGWebCharts_VCL_Demo.dpr
index 9c36c37..d64f27a 100644
--- a/Sample/VCL/TBGWebCharts_VLC_Demo/TBGWebCharts_VCL_Demo.dpr
+++ b/Sample/VCL/TBGWebCharts_VLC_Demo/TBGWebCharts_VCL_Demo.dpr
@@ -1,5 +1,7 @@
 program TBGWebCharts_VCL_Demo;
 
+
+
 {$R *.dres}
 
 uses
diff --git a/Sample/VCL/TBGWebCharts_VLC_Demo/TBGWebCharts_VCL_Demo.dproj b/Sample/VCL/TBGWebCharts_VLC_Demo/TBGWebCharts_VCL_Demo.dproj
index 263e723..0a4956b 100644
--- a/Sample/VCL/TBGWebCharts_VLC_Demo/TBGWebCharts_VCL_Demo.dproj
+++ b/Sample/VCL/TBGWebCharts_VLC_Demo/TBGWebCharts_VCL_Demo.dproj
@@ -58,7 +58,7 @@
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
         <SanitizedProjectName>TBGWebCharts_VCL_Demo</SanitizedProjectName>
-        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts\Source;..\..\..\..\TBGWebCharts\Source\Include;..\..\..\..\TBGWebCharts\Source\Browser;..\..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\..\TBGWebCharts\Source\Charts;..\..\..\..\TBGWebCharts\Source\Generic;..\..\..\..\TBGWebCharts\Source\Maps;..\..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\..\TBGWebCharts\Source\Rows;..\..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <VerInfo_Locale>1040</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
@@ -88,8 +88,8 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Icon_MainIcon>TBGWebCharts_VCL_Demo_Icon.ico</Icon_MainIcon>
-        <UWP_DelphiLogo44>D:\Projetos\Componentes\TBGWebCharts\img\TWebCharts.fw.png</UWP_DelphiLogo44>
-        <UWP_DelphiLogo150>D:\Projetos\Componentes\TBGWebCharts\img\TWebCharts.fw.png</UWP_DelphiLogo150>
+        <UWP_DelphiLogo44>..\..\..\img\TWebCharts.fw.png</UWP_DelphiLogo44>
+        <UWP_DelphiLogo150>..\..\..\img\TWebCharts.fw.png</UWP_DelphiLogo150>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -113,9 +113,9 @@
             <Form>Form2</Form>
             <FormType>dfm</FormType>
         </DCCReference>
-        <RcItem Include="filter.png">
+        <RcItem Include="Images\filter.png">
             <ResourceType>RCDATA</ResourceType>
-            <ResourceId>PngFilter</ResourceId>
+            <ResourceId>PngImage</ResourceId>
         </RcItem>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
@@ -147,8 +147,27 @@
                 <Platform value="Win64">False</Platform>
             </Platforms>
             <Deployment Version="4">
+                <DeployFile LocalName="..\..\..\img\TWebCharts.fw.png" Configuration="Debug" Class="UWP_DelphiLogo44">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets\</RemoteDir>
+                        <RemoteName>Logo44x44.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="D:\Projetos\Componentes\TBGWebCharts\img\TWebCharts.fw.png" Configuration="Debug" Class="UWP_DelphiLogo44"/>
+                <DeployFile LocalName="Images\filter.png" Configuration="Debug" Class="ProjectFile">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="Win32\Debug\TBGWebCharts_VCL_Demo.exe" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName="Win32\Debug\TBGWebCharts_VCL_Demo.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>TBGWebCharts_VCL_Demo.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="filter.png" Configuration="Debug" Class="ProjectFile"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">
diff --git a/Sample/VCL/Update_Charts/Update_Charts.dproj b/Sample/VCL/Update_Charts/Update_Charts.dproj
index b6720a7..2e88a17 100644
--- a/Sample/VCL/Update_Charts/Update_Charts.dproj
+++ b/Sample/VCL/Update_Charts/Update_Charts.dproj
@@ -58,7 +58,7 @@
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
         <SanitizedProjectName>Update_Charts</SanitizedProjectName>
-        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\..\TBGWebCharts\Source;..\..\..\..\TBGWebCharts\Source\Include;..\..\..\..\TBGWebCharts\Source\Browser;..\..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\..\TBGWebCharts\Source\Charts;..\..\..\..\TBGWebCharts\Source\Generic;..\..\..\..\TBGWebCharts\Source\Maps;..\..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\..\TBGWebCharts\Source\Rows;..\..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <VerInfo_Locale>1040</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
diff --git a/Sample/WebBroker/TBGWebCharts_WebBroker.dproj b/Sample/WebBroker/TBGWebCharts_WebBroker.dproj
index 0f9c7ad..bc5f248 100644
--- a/Sample/WebBroker/TBGWebCharts_WebBroker.dproj
+++ b/Sample/WebBroker/TBGWebCharts_WebBroker.dproj
@@ -56,7 +56,7 @@
         <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <VerInfo_Locale>1046</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\..\..\TBGWebCharts;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\TBGWebCharts\Source;..\..\..\TBGWebCharts\Source\Include;..\..\..\TBGWebCharts\Source\Browser;..\..\..\TBGWebCharts\Source\CardStyled;..\..\..\TBGWebCharts\Source\Charts;..\..\..\TBGWebCharts\Source\Generic;..\..\..\TBGWebCharts\Source\Maps;..\..\..\TBGWebCharts\Source\PivotTable;..\..\..\TBGWebCharts\Source\RichTextEditor;..\..\..\TBGWebCharts\Source\Rows;..\..\..\TBGWebCharts\Source\Table;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
     </PropertyGroup>
diff --git a/Alerts.Classes.pas b/Source/Alerts.Classes.pas
similarity index 95%
rename from Alerts.Classes.pas
rename to Source/Alerts.Classes.pas
index 8611a77..e05c9ee 100644
--- a/Alerts.Classes.pas
+++ b/Source/Alerts.Classes.pas
@@ -17,15 +17,15 @@   TModelAlertsClass = class(TInterfacedObject, iModelAlertsClass)
       Destructor Destroy; override;
       class function New(Parent : iModelAlerts) : iModelAlertsClass;
       function primary : iModelAlertsClass;
-      function secondary : iModelAlertsClass;
-      function success : iModelAlertsClass;
-      function danger : iModelAlertsClass;
-      function warning : iModelAlertsClass;
-      function info : iModelAlertsClass;
-      function light : iModelAlertsClass;
-      function dark : iModelAlertsClass;
-      function ResultClass : String;
-      function &End : iModelAlerts;
+      function secondary : iModelAlertsClass;
+      function success : iModelAlertsClass;
+      function danger : iModelAlertsClass;
+      function warning : iModelAlertsClass;
+      function info : iModelAlertsClass;
+      function light : iModelAlertsClass;
+      function dark : iModelAlertsClass;
+      function ResultClass : String;
+      function &End : iModelAlerts;
   end;
 
 implementation
@@ -92,8 +92,8 @@ function TModelAlertsClass.ResultClass: String;
   I: Integer;
 begin
   Result := 'alert alert';
-  for I := 0 to Pred(FList.Count) do
-    Result := Result + FList[I];
+  for I := 0 to Pred(FList.Count) do
+    Result := Result + FList[I];
 end;
 
 function TModelAlertsClass.secondary: iModelAlertsClass;
diff --git a/Alerts.pas b/Source/Alerts.pas
similarity index 100%
rename from Alerts.pas
rename to Source/Alerts.pas
diff --git a/BootstrapCss.pas b/Source/BootstrapCss.pas
similarity index 100%
rename from BootstrapCss.pas
rename to Source/BootstrapCss.pas
diff --git a/BootstrapJS.pas b/Source/BootstrapJS.pas
similarity index 100%
rename from BootstrapJS.pas
rename to Source/BootstrapJS.pas
diff --git a/Browser.Chromium.Events.pas b/Source/Browser/Browser.Chromium.Events.pas
similarity index 100%
rename from Browser.Chromium.Events.pas
rename to Source/Browser/Browser.Chromium.Events.pas
diff --git a/Browser.Chromium.Resources.JSCallback.pas b/Source/Browser/Browser.Chromium.Resources.JSCallback.pas
similarity index 100%
rename from Browser.Chromium.Resources.JSCallback.pas
rename to Source/Browser/Browser.Chromium.Resources.JSCallback.pas
diff --git a/Browser.Chromium.Resources.Pages.pas b/Source/Browser/Browser.Chromium.Resources.Pages.pas
similarity index 100%
rename from Browser.Chromium.Resources.Pages.pas
rename to Source/Browser/Browser.Chromium.Resources.Pages.pas
diff --git a/Browser.Chromium.Resources.pas b/Source/Browser/Browser.Chromium.Resources.pas
similarity index 100%
rename from Browser.Chromium.Resources.pas
rename to Source/Browser/Browser.Chromium.Resources.pas
diff --git a/Browser.FMX.Chromium.pas b/Source/Browser/Browser.FMX.Chromium.pas
similarity index 100%
rename from Browser.FMX.Chromium.pas
rename to Source/Browser/Browser.FMX.Chromium.pas
diff --git a/Browser.FMX.WebBrowser.pas b/Source/Browser/Browser.FMX.WebBrowser.pas
similarity index 100%
rename from Browser.FMX.WebBrowser.pas
rename to Source/Browser/Browser.FMX.WebBrowser.pas
diff --git a/Browser.VCL.Chromium.pas b/Source/Browser/Browser.VCL.Chromium.pas
similarity index 100%
rename from Browser.VCL.Chromium.pas
rename to Source/Browser/Browser.VCL.Chromium.pas
diff --git a/Browser.VCL.WebBrowser.pas b/Source/Browser/Browser.VCL.WebBrowser.pas
similarity index 90%
rename from Browser.VCL.WebBrowser.pas
rename to Source/Browser/Browser.VCL.WebBrowser.pas
index 506c1bb..2c121cf 100644
--- a/Browser.VCL.WebBrowser.pas
+++ b/Source/Browser/Browser.VCL.WebBrowser.pas
@@ -1,32 +1,28 @@
 unit Browser.VCL.WebBrowser;
 
 {$I TBGWebCharts.inc}
-
-interface
-
-uses
-  Interfaces,
-  SHDocVw;
-
-Type
-  TModelBrowserVCLWebBrowser = class(TInterfacedObject, iModelBrowser)
-  private
-    FWebBrowser : TWebBrowser;
-    procedure HtmlBrowserGenerated(CONST HTMLCode: string);
-    function ConvertString(aValue : String) : String;
-    procedure DefineIEVersion;
-    {$IF RTLVERSION > 22 }
-      procedure BeforeNavigate(ASender: TObject; const pDisp: IDispatch; const URL, Flags, TargetFrameName, PostData, Headers: OleVariant; var Cancel: WordBool);
-    {$ENDIF}
-  public
-    constructor Create(Value : TObject);
-    destructor Destroy; override;
-    class function New(Value : TObject) : iModelBrowser;
-    procedure ExecuteScript(Value : iModelJSCommand);
-    function ExecuteScriptResult(Value : iModelJSCommand) : string;
+
+interface
+uses
+  Interfaces,
+  SHDocVw;
+Type
+  TModelBrowserVCLWebBrowser = class(TInterfacedObject, iModelBrowser)
+  private
+    FWebBrowser : TWebBrowser;
+      procedure BeforeNavigate(ASender: TObject; const pDisp: IDispatch; const URL, Flags, TargetFrameName, PostData, Headers: OleVariant; var Cancel: WordBool);
+    function ConvertString(aValue : String) : String;
+    procedure DefineIEVersion;
+    procedure HtmlBrowserGenerated(CONST HTMLCode: string);
+  public
+    constructor Create(Value : TObject);
+    destructor Destroy; override;
+    class function New(Value : TObject) : iModelBrowser;
+    procedure ExecuteScript(Value : iModelJSCommand);
     procedure ExecuteScriptCallback(Value: iModelJSCommand);
+    function ExecuteScriptResult(Value : iModelJSCommand) : string;
     function Generated(FHTML : string) : iModelBrowser;
-  end;
+  end;
 
 implementation
 
@@ -39,12 +35,32 @@ implementation
     CallBackJS,
   {$ENDIF}
   {$IF RTLVERSION > 31 }
-    Win.Registry,
-  {$ELSE}
-    Registry,
-  {$ENDIF}
+    Win.Registry,
+  {$ELSE}
+    Registry,
+  {$ENDIF}
   Winapi.ActiveX, Winapi.Windows;
 
+constructor TModelBrowserVCLWebBrowser.Create(Value: TObject);
+begin
+  FWebBrowser :=  Value as TWebBrowser;
+  DefineIEVersion;
+  {$IF RTLVERSION > 22 }
+    FWebBrowser.OnBeforeNavigate2 := BeforeNavigate;
+  {$ENDIF}
+end;
+
+destructor TModelBrowserVCLWebBrowser.Destroy;
+begin
+
+  inherited;
+end;
+
+class function TModelBrowserVCLWebBrowser.New(Value: TObject): iModelBrowser;
+begin
+  Result := Self.Create(Value);
+end;
+
 { TModelHTMLFactory }
 
 {$IF RTLVERSION > 22 }
@@ -52,91 +68,73 @@ procedure TModelBrowserVCLWebBrowser.BeforeNavigate(ASender: TObject;
   const pDisp: IDispatch; const URL, Flags, TargetFrameName, PostData,
   Headers: OleVariant; var Cancel: WordBool);
 var
-  Target : String;
-  Aux, Method: string;
-  Params : TStringList;
-begin
-  Target := URL;
-  if UpperCase(Target).StartsWith('ACTIONCALLBACKJS') then
-  begin
-    Method := Copy(Target, Pos(':', Target) + 1, Length(Target));
-    Method := Copy(Method, 1, Pos('(', Method) - 1);
-    Params := TStringList.Create;
-    try
-      Aux := Copy(Target, Pos('(', Target) + 1, Length(Target));
-      Aux := Copy(Aux, 1, LastDelimiter(')', Aux)-1);
-      Params.CommaText := Aux;
-      if not Method.IsEmpty then
-        if vCallBackJS.TryGetValue(Method, Params) then
-          Cancel := True;
-    finally
-      Params.Free;
-    end;
+  Aux: string;
+  Method: string;
+  Params: TStringList;
+  Target: String;
+begin
+  Target := URL;
+  if UpperCase(Target).StartsWith('ACTIONCALLBACKJS') then
+  begin
+    Method := Copy(Target, Pos(':', Target) + 1, Length(Target));
+    Method := Copy(Method, 1, Pos('(', Method) - 1);
+    Params := TStringList.Create;
+    try
+      Aux := Copy(Target, Pos('(', Target) + 1, Length(Target));
+      Aux := Copy(Aux, 1, LastDelimiter(')', Aux)-1);
+      Params.CommaText := Aux;
+      if not Method.IsEmpty then
+        if vCallBackJS.TryGetValue(Method, Params) then
+          Cancel := True;
+    finally
+      Params.Free;
+    end;
   end;
 end;
-{$ENDIF}
 
 function TModelBrowserVCLWebBrowser.ConvertString(aValue: String): String;
 var
-  rbs : RawByteString;
-begin
-  rbs := UTF8Encode(aValue);
-  SetCodePage(rbs,0,false);
-  Result := UnicodeString(rbs);
-end;
-
-constructor TModelBrowserVCLWebBrowser.Create(Value: TObject);
+  rbs: RawByteString;
 begin
-  FWebBrowser :=  Value as TWebBrowser;
-  DefineIEVersion;
-  {$IF RTLVERSION > 22 }
-    FWebBrowser.OnBeforeNavigate2 := BeforeNavigate;
-  {$ENDIF}
+  rbs := UTF8Encode(aValue);
+  SetCodePage(rbs,0,false);
+  Result := UnicodeString(rbs);
 end;
 
 procedure TModelBrowserVCLWebBrowser.DefineIEVersion;
 const
-  REG_KEY = 'Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION';
-
-var
-  Reg: TRegistry;
-  AppName: String;
-begin
-  AppName := ExtractFileName(ExtractFileName(ParamStr(0)));
-  Reg := nil;
-  try
-    Reg := TRegistry.Create();
-    Reg.RootKey := HKEY_CURRENT_USER;
-    if Reg.OpenKey(REG_KEY, True) then
-    begin
-//      if Versao = 0 then
-//        Reg.DeleteValue(AppName)
-//      else
-        Reg.WriteInteger(AppName, 11000);
-      Reg.CloseKey;
-    end;
-  except
-
-  end;
-
-  if (Assigned(Reg)) then
-    FreeAndNil(Reg);
-end;
-
-destructor TModelBrowserVCLWebBrowser.Destroy;
+  REG_KEY = 'Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION';
+var
+  AppName: String;
+  Reg: TRegistry;
 begin
-
-  inherited;
+  AppName := ExtractFileName(ExtractFileName(ParamStr(0)));
+  Reg := nil;
+  try
+    Reg := TRegistry.Create();
+    Reg.RootKey := HKEY_CURRENT_USER;
+    if Reg.OpenKey(REG_KEY, True) then
+    begin
+//      if Versao = 0 then
+//        Reg.DeleteValue(AppName)
+//      else
+        Reg.WriteInteger(AppName, 11000);
+      Reg.CloseKey;
+    end;
+  except
+  end;
+  if (Assigned(Reg)) then
+    FreeAndNil(Reg);
 end;
 
 procedure TModelBrowserVCLWebBrowser.ExecuteScript(Value: iModelJSCommand);
 var
-  Doc : IHTMLDocument2;
-  HTMLWindow: IHTMLWindow2;
-begin
-  Doc := FWebBrowser.Document as IHTMLDocument2;
-  if Assigned(Doc) then
-  begin
+  Doc: IHTMLDocument2;
+  HTMLWindow: IHTMLWindow2;
+begin
+  Doc := FWebBrowser.Document as IHTMLDocument2;
+  if Assigned(Doc) then
+  begin
     HTMLWindow := Doc.parentWindow;
     if Assigned(HTMLWindow) then
     begin
@@ -152,8 +150,8 @@ procedure TModelBrowserVCLWebBrowser.ExecuteScript(Value: iModelJSCommand);
 procedure TModelBrowserVCLWebBrowser.ExecuteScriptCallback(
   Value: iModelJSCommand);
 var
-  ValueCallback : string;
-  proc : TProc<string>;
+  proc: TProc<string>;
+  ValueCallback: string;
 begin
   if not Assigned(Value.CallBack) then
     raise Exception.Create('Procedure para Callback inválida');
@@ -164,22 +162,21 @@ procedure TModelBrowserVCLWebBrowser.ExecuteScriptCallback(
 
 function TModelBrowserVCLWebBrowser.ExecuteScriptResult(Value: iModelJSCommand): string;
 var
-  Doc : IHTMLDocument2;
-  body : IHTMLElement2;
-  Tags : IHTMLElementCollection;
-  Tag : IHTMLElement;
-  I : Integer;
-begin
-  Result := '';
-  ExecuteScript(Value);
-
-  if not Supports(FWebBrowser.Document, IHTMLDocument2, Doc) then
-    raise Exception.Create('Documento HTML Inválido');
-  if not Supports(Doc.body, IHTMLElement2, Body) then
-    raise Exception.Create('Não Foi Possível Encontrar o Elemento <body>');
-  Tags := body.getElementsByTagName(UpperCase(Value.TagName));
-  for I := 0 to Pred(Tags.length) do
-  begin
+  body: IHTMLElement2;
+  Doc: IHTMLDocument2;
+  I: Integer;
+  Tag: IHTMLElement;
+  Tags: IHTMLElementCollection;
+begin
+  Result := '';
+  ExecuteScript(Value);
+  if not Supports(FWebBrowser.Document, IHTMLDocument2, Doc) then
+    raise Exception.Create('Documento HTML Inválido');
+  if not Supports(Doc.body, IHTMLElement2, Body) then
+    raise Exception.Create('Não Foi Possível Encontrar o Elemento <body>');
+  Tags := body.getElementsByTagName(UpperCase(Value.TagName));
+  for I := 0 to Pred(Tags.length) do
+  begin
     Tag := Tags.item(I, EmptyParam) as IHTMLElement;
     if Tag.id = Value.TagId then
     begin
@@ -198,31 +195,27 @@ function TModelBrowserVCLWebBrowser.Generated(FHTML: string): iModelBrowser;
 
 procedure TModelBrowserVCLWebBrowser.HtmlBrowserGenerated(const HTMLCode: string);
 var
-  sl : TStringList;
-  ms : TMemoryStream;
-begin
-  if NOT Assigned(FWebBrowser.Document) then
-    FWebBrowser.Navigate('about:blank');
-
-  sl := TStringList.Create;
-  try
-   ms := TMemoryStream.Create;
-   try
-     sl.Text := HTMLCode;
-     sl.SaveToStream(ms) ;
-     ms.Seek(0, 0);
-     (FWebBrowser.Document as IPersistStreamInit).Load(TStreamAdapter.Create(ms)) ;
-   finally
-     ms.Free;
-   end;
-  finally
-   sl.Free;
-  end;
-end;
-
-class function TModelBrowserVCLWebBrowser.New(Value: TObject): iModelBrowser;
+  ms: TMemoryStream;
+  sl: TStringList;
 begin
-  Result := Self.Create(Value);
+  if NOT Assigned(FWebBrowser.Document) then
+    FWebBrowser.Navigate('about:blank');
+  sl := TStringList.Create;
+  try
+   ms := TMemoryStream.Create;
+   try
+     sl.Text := HTMLCode;
+     sl.SaveToStream(ms) ;
+     ms.Seek(0, 0);
+     (FWebBrowser.Document as IPersistStreamInit).Load(TStreamAdapter.Create(ms)) ;
+   finally
+     ms.Free;
+   end;
+  finally
+   sl.Free;
+  end;
 end;
 
+{$ENDIF}
+
 end.
diff --git a/Button.pas b/Source/Button.pas
similarity index 100%
rename from Button.pas
rename to Source/Button.pas
diff --git a/Buttons.Classes.pas b/Source/Buttons.Classes.pas
similarity index 100%
rename from Buttons.Classes.pas
rename to Source/Buttons.Classes.pas
diff --git a/CallBackJS.pas b/Source/CallBackJS.pas
similarity index 100%
rename from CallBackJS.pas
rename to Source/CallBackJS.pas
diff --git a/CardStyled.Callback.pas b/Source/CardStyled/CardStyled.Callback.pas
similarity index 100%
rename from CardStyled.Callback.pas
rename to Source/CardStyled/CardStyled.Callback.pas
diff --git a/CardStyled.IconBackground.pas b/Source/CardStyled/CardStyled.IconBackground.pas
similarity index 100%
rename from CardStyled.IconBackground.pas
rename to Source/CardStyled/CardStyled.IconBackground.pas
diff --git a/CardStyled.IconLeft.pas b/Source/CardStyled/CardStyled.IconLeft.pas
similarity index 100%
rename from CardStyled.IconLeft.pas
rename to Source/CardStyled/CardStyled.IconLeft.pas
diff --git a/CardStyled.IconRight.pas b/Source/CardStyled/CardStyled.IconRight.pas
similarity index 100%
rename from CardStyled.IconRight.pas
rename to Source/CardStyled/CardStyled.IconRight.pas
diff --git a/CardStyled.Shape.Classes.pas b/Source/CardStyled/CardStyled.Shape.Classes.pas
similarity index 100%
rename from CardStyled.Shape.Classes.pas
rename to Source/CardStyled/CardStyled.Shape.Classes.pas
diff --git a/CardStyled.Shape.pas b/Source/CardStyled/CardStyled.Shape.pas
similarity index 100%
rename from CardStyled.Shape.pas
rename to Source/CardStyled/CardStyled.Shape.pas
diff --git a/CardStyled.Text.pas b/Source/CardStyled/CardStyled.Text.pas
similarity index 100%
rename from CardStyled.Text.pas
rename to Source/CardStyled/CardStyled.Text.pas
diff --git a/CardStyled.pas b/Source/CardStyled/CardStyled.pas
similarity index 100%
rename from CardStyled.pas
rename to Source/CardStyled/CardStyled.pas
diff --git a/Chart.Easy.PieCSS.pas b/Source/CardStyled/Chart.Easy.PieCSS.pas
similarity index 100%
rename from Chart.Easy.PieCSS.pas
rename to Source/CardStyled/Chart.Easy.PieCSS.pas
diff --git a/Chart.Easy.PieJS.pas b/Source/CardStyled/Chart.Easy.PieJS.pas
similarity index 100%
rename from Chart.Easy.PieJS.pas
rename to Source/CardStyled/Chart.Easy.PieJS.pas
diff --git a/Cards.DataSet.pas b/Source/Cards.DataSet.pas
similarity index 100%
rename from Cards.DataSet.pas
rename to Source/Cards.DataSet.pas
diff --git a/Cards.pas b/Source/Cards.pas
similarity index 100%
rename from Cards.pas
rename to Source/Cards.pas
diff --git a/ChartJSScript.pas b/Source/ChartJSScript.pas
similarity index 100%
rename from ChartJSScript.pas
rename to Source/ChartJSScript.pas
diff --git a/ChartStreamJS.pas b/Source/ChartStreamJS.pas
similarity index 100%
rename from ChartStreamJS.pas
rename to Source/ChartStreamJS.pas
diff --git a/ChartbundleJS.pas b/Source/ChartbundleJS.pas
similarity index 100%
rename from ChartbundleJS.pas
rename to Source/ChartbundleJS.pas
diff --git a/Charts.Axes.GridLines.pas b/Source/Charts/Charts.Axes.GridLines.pas
similarity index 100%
rename from Charts.Axes.GridLines.pas
rename to Source/Charts/Charts.Axes.GridLines.pas
diff --git a/Charts.Axes.Params.RealTime.pas b/Source/Charts/Charts.Axes.Params.RealTime.pas
similarity index 100%
rename from Charts.Axes.Params.RealTime.pas
rename to Source/Charts/Charts.Axes.Params.RealTime.pas
diff --git a/Charts.Axes.Params.pas b/Source/Charts/Charts.Axes.Params.pas
similarity index 100%
rename from Charts.Axes.Params.pas
rename to Source/Charts/Charts.Axes.Params.pas
diff --git a/Charts.Axes.ScaleLabel.pas b/Source/Charts/Charts.Axes.ScaleLabel.pas
similarity index 100%
rename from Charts.Axes.ScaleLabel.pas
rename to Source/Charts/Charts.Axes.ScaleLabel.pas
diff --git a/Charts.Axes.Ticks.pas b/Source/Charts/Charts.Axes.Ticks.pas
similarity index 100%
rename from Charts.Axes.Ticks.pas
rename to Source/Charts/Charts.Axes.Ticks.pas
diff --git a/Charts.Axes.pas b/Source/Charts/Charts.Axes.pas
similarity index 100%
rename from Charts.Axes.pas
rename to Source/Charts/Charts.Axes.pas
diff --git a/Charts.Callback.pas b/Source/Charts/Charts.Callback.pas
similarity index 100%
rename from Charts.Callback.pas
rename to Source/Charts/Charts.Callback.pas
diff --git a/Charts.Config.pas b/Source/Charts/Charts.Config.pas
similarity index 100%
rename from Charts.Config.pas
rename to Source/Charts/Charts.Config.pas
diff --git a/Charts.DataSet.pas b/Source/Charts/Charts.DataSet.pas
similarity index 100%
rename from Charts.DataSet.pas
rename to Source/Charts/Charts.DataSet.pas
diff --git a/Charts.Easy.Pie.pas b/Source/Charts/Charts.Easy.Pie.pas
similarity index 100%
rename from Charts.Easy.Pie.pas
rename to Source/Charts/Charts.Easy.Pie.pas
diff --git a/Charts.Generic.pas b/Source/Charts/Charts.Generic.pas
similarity index 100%
rename from Charts.Generic.pas
rename to Source/Charts/Charts.Generic.pas
diff --git a/Charts.Labelling.pas b/Source/Charts/Charts.Labelling.pas
similarity index 100%
rename from Charts.Labelling.pas
rename to Source/Charts/Charts.Labelling.pas
diff --git a/Charts.Legends.Labels.pas b/Source/Charts/Charts.Legends.Labels.pas
similarity index 100%
rename from Charts.Legends.Labels.pas
rename to Source/Charts/Charts.Legends.Labels.pas
diff --git a/Charts.Legends.pas b/Source/Charts/Charts.Legends.pas
similarity index 100%
rename from Charts.Legends.pas
rename to Source/Charts/Charts.Legends.pas
diff --git a/Charts.Options.pas b/Source/Charts/Charts.Options.pas
similarity index 100%
rename from Charts.Options.pas
rename to Source/Charts/Charts.Options.pas
diff --git a/Charts.Plugins.pas b/Source/Charts/Charts.Plugins.pas
similarity index 100%
rename from Charts.Plugins.pas
rename to Source/Charts/Charts.Plugins.pas
diff --git a/Charts.Scales.pas b/Source/Charts/Charts.Scales.pas
similarity index 100%
rename from Charts.Scales.pas
rename to Source/Charts/Charts.Scales.pas
diff --git a/Charts.Title.pas b/Source/Charts/Charts.Title.pas
similarity index 100%
rename from Charts.Title.pas
rename to Source/Charts/Charts.Title.pas
diff --git a/Charts.Tooltip.pas b/Source/Charts/Charts.Tooltip.pas
similarity index 100%
rename from Charts.Tooltip.pas
rename to Source/Charts/Charts.Tooltip.pas
diff --git a/Charts.Types.pas b/Source/Charts/Charts.Types.pas
similarity index 100%
rename from Charts.Types.pas
rename to Source/Charts/Charts.Types.pas
diff --git a/Charts.pas b/Source/Charts/Charts.pas
similarity index 100%
rename from Charts.pas
rename to Source/Charts/Charts.pas
diff --git a/Chromium.CustomResourceHandler.pas b/Source/Chromium.CustomResourceHandler.pas
similarity index 100%
rename from Chromium.CustomResourceHandler.pas
rename to Source/Chromium.CustomResourceHandler.pas
diff --git a/Color.pas b/Source/Color.pas
similarity index 100%
rename from Color.pas
rename to Source/Color.pas
diff --git a/Colors.Bootstrap.pas b/Source/Colors.Bootstrap.pas
similarity index 100%
rename from Colors.Bootstrap.pas
rename to Source/Colors.Bootstrap.pas
diff --git a/Credenciais.pas b/Source/Credenciais.pas
similarity index 100%
rename from Credenciais.pas
rename to Source/Credenciais.pas
diff --git a/D3JS.pas b/Source/D3JS.pas
similarity index 100%
rename from D3JS.pas
rename to Source/D3JS.pas
diff --git a/DataTableCss.pas b/Source/DataTableCss.pas
similarity index 100%
rename from DataTableCss.pas
rename to Source/DataTableCss.pas
diff --git a/DataTableJS.pas b/Source/DataTableJS.pas
similarity index 100%
rename from DataTableJS.pas
rename to Source/DataTableJS.pas
diff --git a/DomElement.pas b/Source/DomElement.pas
similarity index 100%
rename from DomElement.pas
rename to Source/DomElement.pas
diff --git a/Factory.pas b/Source/Factory.pas
similarity index 100%
rename from Factory.pas
rename to Source/Factory.pas
diff --git a/FontawesomeallJS.pas b/Source/FontawesomeallJS.pas
similarity index 100%
rename from FontawesomeallJS.pas
rename to Source/FontawesomeallJS.pas
diff --git a/GMapsJS.pas b/Source/GMapsJS.pas
similarity index 100%
rename from GMapsJS.pas
rename to Source/GMapsJS.pas
diff --git a/Generic.Coordinates.pas b/Source/Generic/Generic.Coordinates.pas
similarity index 95%
rename from Generic.Coordinates.pas
rename to Source/Generic/Generic.Coordinates.pas
index 5eb325d..0a1c63d 100644
--- a/Generic.Coordinates.pas
+++ b/Source/Generic/Generic.Coordinates.pas
@@ -14,8 +14,8 @@   TModelGenericCoordinates<T : IInterface> = class(TInterfacedObject, iModelGene
       FLongitude : String;
     public
       constructor Create(Parent : T);
-      destructor Destroy; override;
-      class function New(Parent : T) : iModelGenericCoordinates<T>;
+      destructor Destroy; override;
+      class function New(Parent : T) : iModelGenericCoordinates<T>;
       function Latitude(Value : string) : iModelGenericCoordinates<T>; overload;
       function Longitude(Value : string) : iModelGenericCoordinates<T>; overload;
       function Latitude : string; overload;
@@ -32,10 +32,10 @@ implementation
 constructor TModelGenericCoordinates<T>.Create(Parent: T);
 begin
   {$IF RTLVERSION > 27  }
-    TInjection.Weak(@FParent, Parent);
-  {$ELSE}
-    FParent := Parent;
-  {$IFEND}
+    TInjection.Weak(@FParent, Parent);
+  {$ELSE}
+    FParent := Parent;
+  {$IFEND}
 end;
 
 destructor TModelGenericCoordinates<T>.Destroy;
diff --git a/Generic.DataSet.pas b/Source/Generic/Generic.DataSet.pas
similarity index 100%
rename from Generic.DataSet.pas
rename to Source/Generic/Generic.DataSet.pas
diff --git a/Generic.List.pas b/Source/Generic/Generic.List.pas
similarity index 100%
rename from Generic.List.pas
rename to Source/Generic/Generic.List.pas
diff --git a/Generic.ProgressBar.pas b/Source/Generic/Generic.ProgressBar.pas
similarity index 100%
rename from Generic.ProgressBar.pas
rename to Source/Generic/Generic.ProgressBar.pas
diff --git a/Generic.Style.pas b/Source/Generic/Generic.Style.pas
similarity index 100%
rename from Generic.Style.pas
rename to Source/Generic/Generic.Style.pas
diff --git a/Generic.Title.pas b/Source/Generic/Generic.Title.pas
similarity index 100%
rename from Generic.Title.pas
rename to Source/Generic/Generic.Title.pas
diff --git a/HTML.pas b/Source/HTML.pas
similarity index 97%
rename from HTML.pas
rename to Source/HTML.pas
index ce6f630..3804c06 100644
--- a/HTML.pas
+++ b/Source/HTML.pas
@@ -93,11 +93,11 @@     TModelHTML = class(TInterfacedObject, iModelHTML {$IFDEF HAS_CALLBACK} , iCa
     destructor Destroy; override;
     class function New: iModelHTML;
     function GenerateHead: iModelHTML; overload;
-    function GenerateHead(Value : TList<String>) : iModelHTML; overload;
+    function GenerateHead(const Value: TList<string>): iModelHTML; overload;
     function GenerateFooter: iModelHTML;
     function Jumpline: iModelHTML;
     function HTML: String; overload;
-    function HTML(Value: String): iModelHTML; overload;
+    function HTML(const Value: string): iModelHTML; overload;
     function Charts: iModelHTMLCharts;
     function Rows: IModelHTMLRows;
     function ClearHTML : iModelHTML;
@@ -343,7 +343,7 @@ function TModelHTML.GenerateFooter: iModelHTML;
   FHTML := FHTML + '</html>';
 end;
 
-function TModelHTML.GenerateHead(Value: TList<String>): iModelHTML;
+function TModelHTML.GenerateHead(const Value: TList<string>): iModelHTML;
 var
   I: Integer;
 begin
@@ -402,7 +402,7 @@ function TModelHTML.GenerateHead: iModelHTML;
   FHTML := FHTML + '<body> ';
 end;
 
-function TModelHTML.HTML(Value: String): iModelHTML;
+function TModelHTML.HTML(const Value: string): iModelHTML;
 begin
   Result := Self;
   FHTML := FHTML + Value;
diff --git a/Image.Classes.pas b/Source/Image.Classes.pas
similarity index 100%
rename from Image.Classes.pas
rename to Source/Image.Classes.pas
diff --git a/Image.DataSet.pas b/Source/Image.DataSet.pas
similarity index 100%
rename from Image.DataSet.pas
rename to Source/Image.DataSet.pas
diff --git a/Image.pas b/Source/Image.pas
similarity index 100%
rename from Image.pas
rename to Source/Image.pas
diff --git a/TBGWebCharts.inc b/Source/Include/TBGWebCharts.inc
similarity index 100%
rename from TBGWebCharts.inc
rename to Source/Include/TBGWebCharts.inc
diff --git a/Injection.pas b/Source/Injection.pas
similarity index 100%
rename from Injection.pas
rename to Source/Injection.pas
diff --git a/Source/Interfaces.pas b/Source/Interfaces.pas
new file mode 100644
index 0000000..7b00335
--- /dev/null
+++ b/Source/Interfaces.pas
@@ -0,0 +1,1578 @@
+unit Interfaces;
+{$I TBGWebCharts.inc}
+interface
+uses
+  {$IF RTLVERSION > 22 }
+    {$IFDEF HAS_FMX}
+      {$IFDEF HAS_CHROMIUM}
+        {$DEFINE HAS_CALLBACK}
+      {$ENDIF}
+    {$ELSE}
+      {$DEFINE HAS_CALLBACK}
+    {$ENDIF}
+  {$ENDIF}
+  DB,
+  Generics.Collections,
+  {$IFDEF HAS_FMX}
+    FMX.StdCtrls,
+    FMX.WebBrowser,
+  {$ELSE}
+    {$IF RTLVERSION > 27 }
+      VCL.StdCtrls,
+      VCL.Buttons,
+      SHDocVw,
+    {$IFEND}
+    {$IF RTLVERSION < 28 }
+      StdCtrls,
+      Buttons,
+      SHDocVw,
+    {$IFEND}
+  {$ENDIF}
+  {$IFDEF HAS_CHROMIUM}
+    uCEFInterfaces,
+    {$IFDEF HAS_FMX}
+      uCEFFMXChromium,
+      uCEFFMXWindowParent,
+    {$ELSE}
+      uCEFChromium,
+      uCEFWindowParent,
+    {$ENDIF}
+  {$ENDIF}
+   System.SysUtils,
+   Classes,
+   Charts.Types,
+   Colors.Bootstrap;
+
+type
+  IWebCharts = interface;
+  IModelHTML = interface;
+  IModelHTMLChartsBar = interface;
+  IModelHTMLCharts = interface;
+  IModelHTMLChartsConfig = interface;
+  IModelRowsTitleConfig = interface;
+  IModelHTMLRows = interface;
+  IModelHTMLRowsTitle = interface;
+  IModelHTMLRowsTag = interface;
+  IModelHTMLChartsDoughnut = interface;
+  IModelHTMLChartsLines = interface;
+  IModelHTMLDataSet = interface;
+  IModelHTMLChartsLineStacked = interface;
+  IModelHTMLChartsPie = interface;
+  IModelLabellingConfig<T> = interface;
+  IModelHTMLChartsAxes = interface;
+  IModelHTMLChartsAxesTicks<T> = interface;
+  IModelHTMLChartsAxesParam = interface;
+  IModelHTMLChartsAxesParamRealTime = interface;
+  IModelHTMLChartsAxesGridLines<T> = interface;
+  IModelHTMLChatsAxesScaleLabel<T> = interface;
+  IModelHTMLLegendLabels<T> = interface;
+  IModelHTMLLegend = interface;
+  IModelHTMLTitle<T> = interface;
+  IModelHTMLScales = interface;
+  IModelHTMLTooltip<T> = interface;
+  IModelHTMLOptions = interface;
+  IModelHTMLChartsGeneric = interface;
+  IModelJumbotron = interface;
+  IModelAlerts = interface;
+  IModelAlertsClass = interface;
+  IModelListGroup = interface;
+  IModelListGroupClass = interface;
+  IModelPivotTable = interface;
+  IModelGenericList<T> = interface;
+  IModelPivotTableConfig = interface;
+  IModelPivotTableClass = interface;
+  IModelGenericStyle<T> = interface;
+  IModelGenericDataSet<T> = interface;
+  IModelJSCommand = interface;
+  IModelHTMLPlugins = interface;
+  IModelTableActionImage = Interface;
+  IModelTableAction = interface;
+  IModelBrowser = interface;
+  IModelGenericCoordinates<T> = interface;
+  IModelCredenciais = interface;
+  IModelDOMElement = interface;
+  IModelMaps = interface;
+  IModelGenericTitle<T> = interface;
+  IModelMapsGeneric = interface;
+  IModelMapsOptions = interface;
+  IModelMapsDraw = interface;
+  IModelMapsDrawCircle = interface;
+  IModelMapsDrawMarker = interface;
+  IModelMapsLayer = interface;
+  IModelMapsLayerHeatMap = interface;
+  IModelMapsDataSet<T> = interface;
+  IModelMapsInfoWindow<T> = interface;
+  IModelMapsRoutes = interface;
+  IModelMapsRoutesDirections = interface;
+  IModelMapsRoutesDirectionsPanel = interface;
+  {$IFDEF HAS_CHROMIUM}
+    IModelChromiumResources = interface;
+    IModelChromiumResourcesPages = interface;
+    IModelChromiumResourcesJSCallback = interface;
+  {$ENDIF}
+  IModelLiquidFillGauge = interface;
+  IModelLiquidFillGaugeConfig = interface;
+  IModelCardStyled = interface;
+  IModelCardStyledGeneric = interface;
+  IModelCardStyledText = interface;
+  IModelCardStyledShape = interface;
+  IModelCardStyledShapeClasses = interface;
+  IModelCardStyledCallback = interface;
+  IModelRichTextEditor = interface;
+  IModelRichTextEditorConfig = interface;
+  IModelRichTextEditorConfigPrintHeader = interface;
+  IModelGenericProgressBar<T> = interface;
+  IModelProgress = interface;
+  IModelProgressInfo = interface;
+  IModelProgressInfoText = interface;
+  IModelProgressInfoIcon = interface;
+  {$IFDEF FULL}
+    IModelTable = interface;
+    IModelTableDataSet = interface;
+    IModelTableOption = interface;
+    IModelTableData = interface;
+    IModelTableFeatures = interface;
+    IModelTableClass = interface;
+    IModelHTMLRowsDiv = interface;
+    IModelCardsDataSet = interface;
+    IModelCards = interface;
+    IModelChartEasyPie = interface;
+    IModelButtonClass = interface;
+    IModelButton = interface;
+    {$IFDEF HAS_CALLBACK}
+      ICallbackJS = interface;
+    {$ENDIF}
+    IModelImageDataSet = interface;
+    IModelImage = interface;
+    IModelImageClass = interface;
+    IModelHTMLRowsP = interface;
+    //iCacheControl = interface;
+  {$ENDIF}
+
+  IWebCharts = interface(IInterface)
+    ['{D98D23CE-5E37-4941-89E3-92AF922ACE60}']
+    function AddResource(const Value: string): IWebCharts;
+    function BackgroundColor(const Value: string): IWebCharts;
+    function CDN(const Value: Boolean): IWebCharts;
+    function Container(const Value: TTypeContainer): IWebCharts;
+    function ContinuosProject: IModelHTML;
+    function Credenciais: IModelCredenciais;
+    function FontColor(const Value: string): IWebCharts;
+    function NewProject: IModelHTML; overload;
+    function NewProject(const Container: Boolean): IModelHTML; overload;
+  end;
+
+  IModelHTML = interface(IInterface)
+    ['{6D5210CC-D750-4643-8685-48037F21E6AA}']
+    function Alerts: IModelAlerts;
+    function BackgroundColor(Value: string): IModelHTML;
+    function CDN(Value: Boolean): IModelHTML;
+    function Charts: IModelHTMLCharts;
+    function ClearHTML: IModelHTML;
+    function Container(Value: Boolean): IModelHTML;
+    function ContainerClass(Value: TTypeContainer): IModelHTML;
+    function Credenciais(Value: IModelCredenciais): IModelHTML;
+    function DOMElement: IModelDOMElement;
+    procedure ExecuteScript(Value: IModelJSCommand);
+    procedure ExecuteScriptCallback(Value: IModelJSCommand);
+    function ExecuteScriptResult(Value: IModelJSCommand): string;
+    function FolderDefaultRWC(Value: string): IModelHTML;
+    function FontColor(Value: string): IModelHTML;
+    function Generated: IModelHTML;
+    function GenerateFooter: IModelHTML;
+    function GenerateHead: IModelHTML; overload;
+    function GenerateHead(const Value: TList<string>): IModelHTML; overload;
+    function HTML: string; overload;
+    function HTML(const Value: string): IModelHTML; overload;
+    function Jumbotron: IModelJumbotron;
+    function Jumpline: IModelHTML;
+    function LiquiFillGauge: IModelLiquidFillGauge;
+    function ListGroup: IModelListGroup;
+    function PivotTable: IModelPivotTable;
+    function Print: IModelHTML;
+    function Progress: IModelProgress;
+    function RichTextEditor: IModelRichTextEditor;
+    function Rows: IModelHTMLRows;
+    function WebBrowser(Value: TWebBrowser): IModelHTML; overload;
+    {$IFDEF HAS_CHROMIUM}
+      {$IFDEF HAS_FMX}
+        function WebBrowser(Value: TFMXChromium): IModelHTML; overload;
+        function WindowParent(Value: TFMXWindowParent): IModelHTML; overload;
+      {$ELSE}
+        function WebBrowser(Value: TChromium): IModelHTML; overload;
+        function WindowParent(Value: TCEFWindowParent): IModelHTML; overload;
+      {$ENDIF}
+      function Maps: IModelMaps;
+    {$ENDIF}
+    {$IFDEF FULL}
+      function Cards: IModelCards;
+      function CardStyled: IModelCardStyled;
+      function ChartEasyPie: IModelChartEasyPie;
+      function Table: IModelTable;
+      {$IFDEF HAS_CALLBACK}
+        function Buttons: IModelButton;
+        function CallbackJS: ICallbackJS;
+      {$ENDIF}
+      function Image: IModelImage;
+      //function CacheControl: iCacheControl;
+    {$ENDIF}  end;
+
+  IModelDOMElement = interface(IInterface)
+    ['{D56B9A0A-3945-4FA2-97A6-AB941E42B256}']
+    function &End: IModelHTML;
+    function Html(Value: string): IModelDOMElement;
+    function Id(Value: string): IModelDOMElement;
+    function Update: IModelDOMElement;
+  end;
+
+  IModelCredenciais = interface(IInterface)
+    ['{FCE8B965-DB1B-42E6-B831-588BB955A88A}']
+    function &End: IWebCharts;
+    function APIGoogle: string; overload;
+    function APIGoogle(Value: string): IModelCredenciais; overload;
+  end;
+
+  IModelBrowser = interface(IInterface)
+    ['{90CE8FFC-31D4-423B-A585-5A6B5E01A3F8}']
+    procedure ExecuteScript(Value: IModelJSCommand);
+    procedure ExecuteScriptCallback(Value: IModelJSCommand);
+    function ExecuteScriptResult(Value: IModelJSCommand): string;
+    function Generated(FHTML: string): IModelBrowser;
+  end;
+
+  IModelMaps = interface(IInterface)
+    ['{6FB8BE17-5803-418D-B9A6-2448DFE5B6F9}']
+    function MapType(Value: TTypeMaps): IModelMapsGeneric;
+    function MapTitle: IModelGenericTitle<IModelMaps>;
+    function &End: IModelHTML;
+  end;
+
+  IModelGenericTitle<T> = interface(IInterface)
+    ['{BBADD905-F041-4B05-8729-5F6ED7C3F286}']
+    function &End: T;
+    function FontColor: string; overload;
+    function FontColor(Value: string): IModelGenericTitle<T>; overload;
+    function FontColorHEX: string; overload;
+    function FontColorHEX(Value: string): IModelGenericTitle<T>; overload;
+    function FontFamily: string; overload;
+    function FontFamily(Value: string): IModelGenericTitle<T>; overload;
+    function FontSize: string; overload;
+    function FontSize(Value: Integer): IModelGenericTitle<T>; overload;
+    function FontSize(Value: string): IModelGenericTitle<T>; overload;
+    function Result: string;
+    function Text: string; overload;
+    function Text(Value: string): IModelGenericTitle<T>; overload;
+    function TextAlignment: string; overload;
+    function TextAlignment(Value: string): IModelGenericTitle<T>; overload;
+  end;
+
+  IModelMapsGeneric = interface(IInterface)
+    ['{9831E9BF-E318-4D65-9722-B1A8E9562AC3}']
+    function &End: IModelMaps;
+    function Draw: IModelMapsDraw;
+    function GetDirectionResult(Value: TProc<string>): IModelMapsGeneric;
+    function GetGeoCodeResult(Value: TProc<string>): IModelMapsGeneric;
+    function Height(Value: string): IModelMapsGeneric;
+    function Layer: IModelMapsLayer;
+    function Name: string; overload;
+    function Name(Value: string): IModelMapsGeneric; overload;
+    function Options: IModelMapsOptions;
+    function ResultClass: string;
+    function Routes: IModelMapsRoutes;
+    function Width(Value: string): IModelMapsGeneric;
+  end;
+
+  IModelMapsOptions = interface(IInterface)
+    ['{ADAAA471-ED18-411D-9855-04ABFCCBB9B6}']
+    function &End: IModelMapsGeneric;
+    function Center: IModelGenericCoordinates<IModelMapsOptions>;
+    function FullScreenControl: IModelMapsOptions; overload;
+    function FullScreenControl(Value: Boolean): IModelMapsOptions; overload;
+    function MapStyle(Value: TTypeMapStyle): IModelMapsOptions;
+    function MapTypeControl: IModelMapsOptions; overload;
+    function MapTypeControl(Value: Boolean): IModelMapsOptions; overload;
+    function ResultScript: string;
+    function RotateControl(Value: Boolean): IModelMapsOptions; overload;
+    function StreetViewControl: IModelMapsOptions; overload;
+    function StreetViewControl(Value: Boolean): IModelMapsOptions; overload;
+    function Tilt(Value: Boolean): IModelMapsOptions; overload;
+    function Zoom(Value: Integer): IModelMapsOptions;
+    function ZoomControl: IModelMapsOptions; overload;
+    function ZoomControl(Value: Boolean): IModelMapsOptions; overload;
+  end;
+
+  IModelMapsDraw = interface(IInterface)
+    ['{00620760-9D3F-48FE-9FB4-91CB43C64F53}']
+    function &End: IModelMapsGeneric;
+    function Circle: IModelMapsDrawCircle;
+    function Marker: IModelMapsDrawMarker;
+    function ResultScript: string;
+  end;
+
+  IModelMapsDrawMarker = interface(IInterface)
+    ['{03FDD2B8-7C64-41C1-A9B6-4284EBE6B997}']
+    function &End: IModelMapsDraw;
+    function DataSet: IModelMapsDataSet<IModelMapsDrawMarker>;
+    function InfoWindow: IModelMapsInfoWindow<IModelMapsDrawMarker>;
+    function ResultScript(Value: string): string;
+  end;
+
+  IModelMapsDrawCircle = interface(IInterface)
+    ['{14E21290-71DA-4BE7-919B-DA81B6E765E7}']
+    function &End: IModelMapsDraw;
+    function DataSet: IModelMapsDataSet<IModelMapsDrawCircle>;
+    function Fator(Value: integer): IModelMapsDrawCircle;
+    function FillColor(Value: string): IModelMapsDrawCircle;
+    function FillOpacity(Value: string): IModelMapsDrawCircle;
+    function InfoWindow: IModelMapsInfoWindow<IModelMapsDrawCircle>;
+    function ResultScript(MapName: string): string;
+    function StrokeColor(Value: string): IModelMapsDrawCircle;
+    function StrokeOpacity(Value: string): IModelMapsDrawCircle;
+    function StrokeWeight(Value: Integer): IModelMapsDrawCircle;
+  end;
+
+  IModelMapsLayer = interface(IInterface)
+    ['{ACABBD56-A9D9-4D0B-85B1-6D115C218FAD}']
+    function &End: IModelMapsGeneric;
+    function HeatMap: IModelMapsLayerHeatMap;
+    function ResultScript: string;
+  end;
+
+  IModelMapsLayerHeatMap = interface(IInterface)
+    ['{A46B4845-FF76-48D5-AB8A-C7F39D0FE34C}']
+    function &End: IModelMapsLayer;
+    function DataSet: IModelMapsDataSet<IModelMapsLayerHeatMap>;
+    function Opacity(Value: string):IModelMapsLayerHeatMap;
+    function Radius(Value: string): IModelMapsLayerHeatMap;
+    function ResultScript(MapName: string): string;
+  end;
+
+  IModelMapsDataSet<T> = interface(IInterface)
+    ['{F58E5C44-D904-4347-BC57-CF7889DB4DD1}']
+    function &End: T;
+    function AddressName: string; overload;
+    function AddressName(Value: string): IModelMapsDataSet<T>; overload;
+    function DataSet: TDataSet; overload;
+    function DataSet(Value: TDataSet): IModelMapsDataSet<T>; overload;
+    function IdAddressName: string; overload;
+    function IdAddressName(Value: string): IModelMapsDataSet<T>; overload;
+    function InfoName: string; overload;
+    function InfoName(Value: string): IModelMapsDataSet<T>; overload;
+    function LabelName: string; overload;
+    function LabelName(Value: string): IModelMapsDataSet<T>; overload;
+    function LatName: string; overload;
+    function LatName(Value: string): IModelMapsDataSet<T>; overload;
+    function LngName: string; overload;
+    function LngName(Value: string): IModelMapsDataSet<T>; overload;
+    function ValueName: string; overload;
+    function ValueName(Value: string): IModelMapsDataSet<T>; overload;
+  end;
+
+  IModelMapsInfoWindow<T> = interface(IInterface)
+    ['{E850C6C0-C800-49A1-A582-725CEDE94178}']
+    function &End: T;
+    function MaxWidth: string; overload;
+    function MaxWidth(Value: integer): IModelMapsInfoWindow<T>; overload;
+    function MinWidth: string; overload;
+    function MinWidth(Value: integer): IModelMapsInfoWindow<T>; overload;
+    function StartOpened: string; overload;
+    function StartOpened(Value: Boolean): IModelMapsInfoWindow<T>; overload;
+  end;
+
+  IModelMapsRoutes = interface(IInterface)
+    ['{26523E12-4DFB-482B-B549-DB3CFD2E8A96}']
+    function &End: IModelMapsGeneric;
+    function Directions: IModelMapsRoutesDirections;
+    function ResultScript: string;
+  end;
+
+  IModelMapsRoutesDirections = interface(IInterface)
+    ['{BC86B376-85F0-4939-8A7B-169F54D6AA88}']
+    function &End: IModelMapsRoutes;
+    function DataSet: IModelMapsDataSet<IModelMapsRoutesDirections>;
+    function Destination(Value: string): IModelMapsRoutesDirections;
+    function OptimizeWaypoints(Value: Boolean): IModelMapsRoutesDirections;
+    function Origin(Value: string): IModelMapsRoutesDirections;
+    function Panel: IModelMapsRoutesDirectionsPanel;
+    function ResultScript(MapName: string): string;
+    function TravelMode(Value: TTypeMapTravelMode): IModelMapsRoutesDirections;
+  end;
+
+  IModelMapsRoutesDirectionsPanel = interface(IInterface)
+    function &End: IModelMapsRoutesDirections;
+    function FloatPos: string; overload;
+    function FloatPos(Value: string): IModelMapsRoutesDirectionsPanel; overload;
+    function Width: string; overload;
+    ['{12C3A169-AB02-494B-871B-C37259B4C023}']
+    function Width(Value: string): IModelMapsRoutesDirectionsPanel; overload;
+  end;
+
+  {$IFDEF HAS_CHROMIUM}
+    IModelChromiumResourcesPages = interface(IInterface)
+      ['{30782EC6-B430-4FC1-9B23-D06693BE23D4}']
+      function Add(HTML: string): string;
+      function Extract(Key: string):ICefResourceHandler;
+      function Get(Key: string): ICefResourceHandler;
+      procedure Remove(Key: string);
+    end;
+
+    IModelChromiumResourcesJSCallback = interface(IInterface)
+      ['{384A33CB-A7E7-40C3-88EA-F656605C0964}']
+      function Add(Proc: TProc<string>): string;
+      function Extract(Key: string):TProc<string>;
+      function Get(Key: string): TProc<string>;
+      procedure Remove(Key: string);
+    end;
+
+    IModelChromiumResources = interface(IInterface)
+      ['{16F507A0-D848-4491-AF0A-8AE73782FBB2}']
+      function JSCallback: IModelChromiumResourcesJSCallback;
+      function Pages: IModelChromiumResourcesPages;
+    end;
+  {$ENDIF}
+
+  IModelLiquidFillGauge = interface(IInterface)
+    ['{9ECA3F3B-E741-4B9E-9FAE-46A52D195CD5}']
+    function &End: IModelHTML;
+    function Align(Value:string): IModelLiquidFillGauge;
+    function Config: IModelLiquidFillGaugeConfig;
+    function Height(Value: string): IModelLiquidFillGauge;
+    function Name: string; overload;
+    function Name(Value: string): IModelLiquidFillGauge; overload;
+    function Title: IModelGenericTitle<IModelLiquidFillGauge>;
+    function UpdateValue: IModelLiquidFillGauge;
+    function Value(Value: string): IModelLiquidFillGauge;
+    function Width(Value: string): IModelLiquidFillGauge;
+  end;
+
+  IModelLiquidFillGaugeConfig = interface(IInterface)
+    ['{A8E00200-7895-4E94-9492-7A5BE4863B04}']
+    function &End: IModelLiquidFillGauge;
+    function CircleColor(Value: string): IModelLiquidFillGaugeConfig;
+    function CircleColorHex(Value: string): IModelLiquidFillGaugeConfig;
+    function CircleFillGap(Value: Integer): IModelLiquidFillGaugeConfig;
+    function CircleThickness(Value: Integer): IModelLiquidFillGaugeConfig;
+    function DisplayPercent(Value: Boolean): IModelLiquidFillGaugeConfig;
+    function MaxValue(Value: integer): IModelLiquidFillGaugeConfig;
+    function MinValue(Value: integer): IModelLiquidFillGaugeConfig;
+    function ResultScript: string;
+    function TextColor(Value: string): IModelLiquidFillGaugeConfig;
+    function TextColorHex(Value: string): IModelLiquidFillGaugeConfig;
+    function TextSize(Value: Integer): IModelLiquidFillGaugeConfig;
+    function TextVertPosition(Value: Integer): IModelLiquidFillGaugeConfig;
+    function ValueCountUp(Value: Boolean): IModelLiquidFillGaugeConfig;
+    function WaveAnimate(Value: Boolean): IModelLiquidFillGaugeConfig;
+    function WaveAnimateTime(Value: Integer): IModelLiquidFillGaugeConfig;
+    function WaveColor(Value: string): IModelLiquidFillGaugeConfig;
+    function WaveColorHex(Value: string): IModelLiquidFillGaugeConfig;
+    function WaveCount(Value: Integer): IModelLiquidFillGaugeConfig;
+    function WaveHeight(Value: Integer): IModelLiquidFillGaugeConfig;
+    function WaveHeightScaling(Value: Boolean): IModelLiquidFillGaugeConfig;
+    function WaveOffset(Value: Integer): IModelLiquidFillGaugeConfig;
+    function WaveRise(Value: Boolean): IModelLiquidFillGaugeConfig;
+    function WaveRiseTime(Value: Integer): IModelLiquidFillGaugeConfig;
+    function WaveTextColor(Value: string): IModelLiquidFillGaugeConfig;
+    function WaveTextColorHex(Value: string): IModelLiquidFillGaugeConfig;
+  end;
+
+  IModelCardStyled = interface(IInterface)
+    ['{9DB61CB7-D7D1-4E62-80AE-815CD0BC3717}']
+    function &End: IModelHTML;
+    function CardType(Value: TTypeCardStyled): IModelCardStyledGeneric;
+  end;
+
+  IModelCardStyledGeneric = interface(IInterface)
+    ['{3CE71864-DAF3-4C3A-8CEA-A715BBDDD85C}']
+    function &End: IModelCardStyled;
+    function BackgroundColor(Value: string): IModelCardStyledGeneric;
+    function Body: IModelCardStyledText;
+    function Callback: IModelCardStyledCallback;
+    function Col(Value: Integer): IModelCardStyledGeneric;
+    function Colmd(Value: Integer): IModelCardStyledGeneric;
+    function Colxl(Value: Integer): IModelCardStyledGeneric;
+    function DefaultFontColor(Value: string): IModelCardStyledGeneric;
+    function Footer: IModelCardStyledText;
+    function HTML: string;
+    function Name(Value: string): IModelCardStyledGeneric;
+    function Progress: IModelGenericProgressBar<IModelCardStyledGeneric>;
+    function Shape: IModelCardStyledShape;
+    function Title: IModelCardStyledText;
+  end;
+
+  IModelCardStyledCallback = interface(IInterface)
+    ['{9F8311B1-92BC-49FC-BCDD-CC5DCED5C3FD}']
+    function &End: IModelCardStyledGeneric;
+    function MethodName(aValue: string): IModelCardStyledCallback;
+    function ParamValue(aValue: string): IModelCardStyledCallback;
+    function ResultClass: string;
+  end;
+
+  IModelCardStyledText = interface(IInterface)
+    ['{C6A880DD-CA67-4335-9FD8-378A334CD59A}']
+    function Style: IModelGenericStyle<IModelCardStyledText>;
+    function Text(Value: string): IModelCardStyledText; overload;
+    function Text: string; overload;
+    function &End: IModelCardStyledGeneric;
+  end;
+
+  IModelCardStyledShape = interface(IInterface)
+    ['{DD59592F-FA79-4E15-84C4-C53143A0F1A6}']
+    function &End: IModelCardStyledGeneric;
+    function ColAuto(Value: Boolean): IModelCardStyledShape;
+    function Icon(Value: string):  IModelCardStyledShape;
+    function ResultClass: string;
+    function ShapeClass: IModelCardStyledShapeClasses;
+    function Style: IModelGenericStyle<IModelCardStyledShape>;
+    function Text(Value: string): IModelCardStyledShape;
+  end;
+
+  IModelCardStyledShapeClasses = interface(IInterface)
+    ['{B03205C4-5A8A-49D9-B37F-DBD47AAC999A}']
+    function &End: IModelCardStyledShape;
+    function ResultShapeClass: string;
+    function Rounded: IModelCardStyledShapeClasses;
+    function RoundedCircle: IModelCardStyledShapeClasses;
+    function Shadow: IModelCardStyledShapeClasses;
+  end;
+
+  IModelRichTextEditor = interface(IInterface)
+    ['{B06FEC4A-D856-405A-BBCA-9DC9B1ABBD68}']
+    function &End: IModelHTML;
+    function Attributes: IModelRichTextEditorConfig;
+    function LoadContent(aValue: string): IModelRichTextEditor;
+    function SaveContent(Value: TProc<string>): IModelRichTextEditor;
+    function SaveContentHtml(Value: TProc<string>): IModelRichTextEditor;
+    function SaveContentText(Value: TProc<string>): IModelRichTextEditor;
+  end;
+
+  IModelRichTextEditorConfig = interface(IInterface)
+    function &End: IModelRichTextEditor;
+    ['{F17E30E3-C930-4907-B79E-9A7D1DABFFF6}']
+    function Content(aValue: string): IModelRichTextEditorConfig;
+    function Height(aValue: string): IModelRichTextEditorConfig;
+    function Margin(aValue: string): IModelRichTextEditorConfig;
+    function MaxHeight(aValue: string): IModelRichTextEditorConfig;
+    function MaxWidth(aValue: string): IModelRichTextEditorConfig;
+    function PlaceHolder(aValue: string): IModelRichTextEditorConfig;
+    function PrintHeader: IModelRichTextEditorConfigPrintHeader;
+    function ReadOnly(aValue: Boolean): IModelRichTextEditorConfig;
+    function ResultConfig: string;
+    function ResultContent: string;
+    function ResultPrintHeader: string;
+    function ResultStyleContainer: string;
+    function ResultStyleEditor: string;
+    function Width(aValue: string): IModelRichTextEditorConfig;
+  end;
+
+  IModelRichTextEditorConfigPrintHeaderDiv = interface;
+  IModelRichTextEditorConfigPrintHeaderImage = interface;
+  IModelRichTextEditorConfigPrintHeaderTitle = interface;
+
+  IModelRichTextEditorConfigPrintHeader = interface(IInterface)
+    ['{7011CAA5-ACA4-4CB6-A41C-61BCBDF083FA}']
+    function &Div: IModelRichTextEditorConfigPrintHeaderDiv;
+    function &End: IModelRichTextEditorConfig;
+    function HTML: string;
+  end;
+
+  IModelRichTextEditorConfigPrintHeaderDiv = interface(IInterface)
+    ['{21CC0E25-6451-4E02-8CDE-0B5BF457586A}']
+    function &End: IModelRichTextEditorConfigPrintHeader;
+    function Col(aValue: Integer): IModelRichTextEditorConfigPrintHeaderDiv; overload;
+    function Col(aValue: string): IModelRichTextEditorConfigPrintHeaderDiv; overload;
+    function HTML: string;
+    function Image: IModelRichTextEditorConfigPrintHeaderImage;
+    function Title: IModelRichTextEditorConfigPrintHeaderTitle;
+  end;
+  IModelRichTextEditorConfigPrintHeaderImage = interface
+    ['{D9AD1ABA-940A-4CBA-AA1D-2E1C2D2D234C}']
+    function HTML: string;
+    function Image(aValue: TCustomMemoryStream): IModelRichTextEditorConfigPrintHeaderImage; overload;
+    function Image(aValue: string): IModelRichTextEditorConfigPrintHeaderImage; overload;
+    function Style: IModelGenericStyle<IModelRichTextEditorConfigPrintHeaderImage>;
+    function &End: IModelRichTextEditorConfigPrintHeaderDiv;
+  end;
+
+  IModelRichTextEditorConfigPrintHeaderTitle = interface(IInterface)
+    ['{35743850-BD83-49C4-A0DD-BCDBD70A9911}']
+    function &End: IModelRichTextEditorConfigPrintHeaderDiv;
+    function HTML: string;
+    function Style: IModelGenericStyle<IModelRichTextEditorConfigPrintHeaderTitle>;
+    function Text(aValue: string): IModelRichTextEditorConfigPrintHeaderTitle; overload;
+  end;
+
+  IModelGenericProgressBar<T> = interface(IInterface)
+    ['{7442EC82-63F9-44DF-A346-4529556F79EE}']
+    function &End: T;
+    function Background(aValue: string): IModelGenericProgressBar<T>;
+    function Color(aValue: string): IModelGenericProgressBar<T>;
+    function DisplayLabel(aValue: Boolean): IModelGenericProgressBar<T>;
+    function Height: string; overload;
+    function Height(aValue: Integer): IModelGenericProgressBar<T>; overload;
+    function HTML: string;
+    function Sytle(aValue: TTypeBackgroundColor): IModelGenericProgressBar<T>;
+    function Value(aValue: string): IModelGenericProgressBar<T>;
+  end;
+
+  IModelProgress = interface(IInterface)
+    ['{5AEB894D-A80F-4FA2-89E8-EF4EAE6F11DB}']
+    function &End: IModelHTML;
+    function Height(aValue: integer): IModelProgress;
+    function HTML: string;
+    function Info: IModelProgressInfo;
+    function MarginTop(aValue: string): IModelProgress;
+    function ProgressBar: IModelGenericProgressBar<IModelProgress>;
+  end;
+
+  IModelProgressInfo = interface
+    ['{33505BD6-334C-4B41-9043-AFE6495B5E2C}']
+    function &End: IModelProgress;
+    function Icon: IModelProgressInfoIcon;
+    function ResultClass: string;
+    function Title: IModelProgressInfoText;
+    function Value: IModelProgressInfoText;
+  end;
+
+  IModelProgressInfoText = interface(IInterface)
+    ['{8EB4A93C-D5B6-42C0-A66C-9B2ECA5832F0}']
+    function &End: IModelProgressInfo;
+    function Style: IModelGenericStyle<IModelProgressInfoText>;
+    function Text: string; overload;
+    function Text(Value: string): IModelProgressInfoText; overload;
+  end;
+
+  IModelProgressInfoIcon = interface(IInterface)
+    ['{86914363-ED8C-46C6-912B-372855C175F0}']
+    function &End: IModelProgressInfo;
+    function Icon: string; overload;
+    function Icon(Value: string): IModelProgressInfoIcon; overload;
+    function Positive(Value: Boolean = true): IModelProgressInfoIcon;
+    function Style: IModelGenericStyle<IModelProgressInfoIcon>;
+    function Up(Value: Boolean = true): IModelProgressInfoIcon;
+  end;
+
+//  iLabelLing = interface
+//    function Numeral(Value: string): iLabelLing;
+//    function Result: string;
+//  end;
+//
+//  iNumeral = interface
+//    function Result(Value: string): string;
+//  end;
+  IModelHTMLRows = interface(IInterface)
+    ['{684C6EA3-4C2D-4AA9-9A94-BF0A07B14A8B}']
+    function &End: IModelHTML;
+    function HTML: string; overload;
+    function HTML(Value: string): IModelHTMLRows; overload;
+    function ID(Value: string): IModelHTMLRows;
+    function Tag: IModelHTMLRowsTag;
+    function Title: IModelHTMLRowsTitle;
+    {$IFDEF FULL}
+    function _Div: IModelHTMLRowsDiv;
+    function _P: IModelHTMLRowsP;
+    {$ENDIF}
+  end;
+
+  IModelHTMLRowsTag = interface(IInterface)
+    ['{15075847-E7A6-4F18-878D-A7DBCECABE94}']
+    function &End: IModelHTMLRows;
+    function Add(Value: string): IModelHTMLRowsTag;
+  end;
+
+  IModelHTMLRowsTitle = interface(IInterface)
+    ['{F2D34927-8232-4A18-944A-DB0ADAD1C903}']
+    function &End: IModelHTMLRows;
+    function Config: IModelRowsTitleConfig;
+    function Configuracoes: IModelRowsTitleConfig;
+    function HTML: string; overload;
+    function HTML(Value: string): IModelHTMLRowsTitle; overload;
+  end;
+
+  IModelRowsTitleConfig = interface(IInterface)
+    ['{87031018-5C12-42DF-895F-2602B87FE468}']
+    function &End: IModelHTMLRowsTitle;
+    function H1: string; overload;
+    function H1(Value: string): IModelRowsTitleConfig; overload;
+    function H2: string; overload;
+    function H2(Value: string): IModelRowsTitleConfig; overload;
+    function H3: string; overload;
+    function H3(Value: string): IModelRowsTitleConfig; overload;
+    function H4: string; overload;
+    function H4(Value: string): IModelRowsTitleConfig; overload;
+    function H5: string; overload;
+    function H5(Value: string): IModelRowsTitleConfig; overload;
+  end;
+
+  IModelHTMLCharts = interface(IInterface)
+    ['{4CC23536-78BD-40F7-B4A8-D5625E849065}']
+    function &End: IModelHTML;
+    function HTML: string; overload;
+    function HTML(Value: string): IModelHTMLCharts; overload;
+    function _ChartType: TTypeChart; overload;
+    function _ChartType(Value: TTypeChart): IModelHTMLChartsGeneric; overload;
+  end;
+
+  IModelHTMLChartsGeneric = interface(IInterface)
+    ['{83AA6A13-6102-4352-9503-FF9C4AA2C4C7}']
+    function &End: IModelHTMLCharts;
+    function Attributes: IModelHTMLChartsConfig;
+    function HTML: string; overload;
+    function HTML(Value: string): IModelHTMLChartsGeneric; overload;
+    function UpdateChart: IModelHTMLChartsGeneric;
+    function UpdateRealTime: IModelHTMLChartsGeneric;
+  end;
+
+  IModelHTMLChartsDoughnut = interface(IInterface)
+    ['{709FF228-7F8A-4E2B-8AB9-EFAEC9AEE1B4}']
+    function &End: IModelHTMLCharts;
+    function Attributes: IModelHTMLChartsConfig;
+    function HTML: string; overload;
+    function HTML(Value: string): IModelHTMLChartsDoughnut; overload;
+    function SemiCircule(aValue: Boolean ): IModelHTMLChartsDoughnut; overload;
+  end;
+
+  IModelHTMLChartsBar = interface(IInterface)
+    ['{25AE0278-2105-4223-86A9-41F289F75EAE}']
+    function &End: IModelHTMLCharts;
+    function Attributes: IModelHTMLChartsConfig;
+    function HTML: string; overload;
+    function HTML(Value: string): IModelHTMLChartsBar; overload;
+  end;
+
+  IModelHTMLChartsLines = interface(IInterface)
+    ['{10DCD4CF-984F-4952-919A-5259A13A9D8D}']
+    function &End: IModelHTMLCharts;
+    function Attributes: IModelHTMLChartsConfig;
+    function HTML: string; overload;
+    function HTML(Value: string): IModelHTMLChartsLines; overload;
+  end;
+
+  IModelHTMLChartsLineStacked = interface(IInterface)
+    ['{6A3F3157-8FB2-4D72-A33A-27A66BED2661}']
+    function &End: IModelHTMLCharts;
+    function Attributes: IModelHTMLChartsConfig;
+    function HTML: string; overload;
+    function HTML(Value: string): IModelHTMLChartsLineStacked; overload;
+  end;
+
+  IModelHTMLChartsPie = interface(IInterface)
+    ['{470E91C0-58DF-440E-AF3A-445746F0CFE0}']
+    function &End: IModelHTMLCharts;
+    function Attributes: IModelHTMLChartsConfig;
+    function HTML: string; overload;
+    function HTML(Value: string): IModelHTMLChartsPie; overload;
+  end;
+
+  IModelHTMLChartsConfig = interface(IInterface)
+    ['{B140654A-10FE-48A2-93B8-3D90743E3F1E}']
+    function &End: IModelHTMLChartsGeneric;
+    function BackgroundColor: string; overload;
+    function BackgroundColor(Value: string): IModelHTMLChartsConfig; overload;
+    function CallBackLink: string; overload;
+    function CallBackLink(Value: string): IModelHTMLChartsConfig; overload;
+    function ColSpan: Integer; overload;
+    function ColSpan(Value: Integer): IModelHTMLChartsConfig; overload;
+    function Data: string; overload;
+    function Data(Value: string): IModelHTMLChartsConfig; overload;
+    function DataSet: IModelHTMLDataSet;
+    function Heigth: Integer; overload;
+    function Heigth(Value: Integer): IModelHTMLChartsConfig; overload;
+    function IDChart: string;
+    function Labelling: IModelLabellingConfig<IModelHTMLChartsConfig>; overload;
+    function Labels: string; overload;
+    function Labels(Value: string): IModelHTMLChartsConfig; overload;
+    function Name: string; overload;
+    function Name(Value: string): IModelHTMLChartsConfig; overload;
+    function Options: IModelHTMLOptions;
+    function ResultDataSet: string;
+    function ResultLabels: string;
+    function ResultRealTimeInitialValue: string;
+    function Stacked: Boolean; overload;
+    function Stacked(Value: Boolean): IModelHTMLChartsConfig; overload;
+    function Width: Integer; overload;
+    function Width(Value: Integer): IModelHTMLChartsConfig; overload;
+  end;
+
+  IModelHTMLOptions = interface(IInterface)
+    ['{8984AFE4-EBFC-4C97-B7BC-D3DA8FFFB42B}']
+    function &End: IModelHTMLChartsConfig;
+    function HideLabelEmptyData(Value: Boolean): IModelHTMLOptions;
+    function Legend: IModelHTMLLegend;
+    function Plugins: IModelHTMLPlugins;
+    function Result: string;
+    function Scales: IModelHTMLScales;
+    function SemiCircule(Value: Boolean ): IModelHTMLOptions;
+    function SkipEmptyData(Value: Boolean): IModelHTMLOptions;
+    function Title: IModelHTMLTitle<IModelHTMLOptions>;
+    function Tooltip: IModelHTMLTooltip<IModelHTMLOptions>;
+  end;
+
+  IModelHTMLPlugins = interface(IInterface)
+    ['{55083212-FCFF-4AEC-A1ED-AEFC2C39BB5E}']
+    function &End: IModelHTMLOptions;
+    function Result: string;
+    function Streaming(Value: Boolean): IModelHTMLPlugins;
+  end;
+
+  IModelHTMLScales = interface(IInterface)
+    ['{5968D5D3-75C9-4F2C-9E66-3361A92D8DA4}']
+    function &End: IModelHTMLOptions;
+    function Axes: IModelHTMLChartsAxes;
+    function GeneratedAxes(Value: Boolean ): IModelHTMLScales;
+    function Result: string;
+  end;
+
+  IModelHTMLTooltip<T> = interface(IInterface)
+    ['{5968D5D3-75C9-4F2C-9E66-3361A92D8DA4}']
+    function &End: T;
+    function DisplayTitle(Value: Boolean): IModelHTMLTooltip<T>;
+    function Enabled(Value: Boolean): IModelHTMLTooltip<T>;
+    function Format(Value: string): IModelHTMLTooltip<T>;
+    function HideZeroValues(Value: Boolean): IModelHTMLTooltip<T>;
+    function InteractionModeDataset: IModelHTMLTooltip<T>;
+    function InteractionModeIndex: IModelHTMLTooltip<T>;
+    function InteractionModeNearest: IModelHTMLTooltip<T>;
+    function InteractionModePoint: IModelHTMLTooltip<T>;
+    function InteractionModeX: IModelHTMLTooltip<T>;
+    function InteractionModeY: IModelHTMLTooltip<T>;
+    function Intersect(Value: Boolean): IModelHTMLTooltip<T>;
+    function Result: string;
+    function ToolTipNoScales: IModelHTMLTooltip<T>;
+  end;
+
+  IModelHTMLTitle<T> = interface(IInterface)
+    ['{21A4474D-87C2-435B-9881-D385518C6EA6}']
+    function &End: T;
+    function Display: Boolean; overload;
+    function Display(Value: Boolean ):  IModelHTMLTitle<T>; overload;
+    function FontColorHEX: string; overload;
+    function FontColorHEX(Value: string ): IModelHTMLTitle<T>; overload;
+    function FontFamily: string; overload;
+    function FontFamily(Value: string ): IModelHTMLTitle<T>; overload;
+    function FontSize: Integer; overload;
+    function FontSize(Value: Integer ): IModelHTMLTitle<T>; overload;
+    function FontStyle: string; overload;
+    function FontStyle(Value: string ): IModelHTMLTitle<T>; overload;
+    function Padding: Integer; overload;
+    function Padding(Value: Integer ): IModelHTMLTitle<T>; overload;
+    function Position: string; overload;
+    function Position(Value: string ): IModelHTMLTitle<T>; overload;
+    function Result: string;
+    function Text: string; overload;
+    function Text(Value: string ): IModelHTMLTitle<T>; overload;
+  end;
+
+  IModelHTMLLegend = interface(IInterface)
+    ['{BC60AEB1-5404-4355-868A-D26BB5A2C773}']
+    function &End: IModelHTMLOptions;
+    function Display: Boolean; overload;
+    function Display(Value: Boolean ): IModelHTMLLegend; overload;
+    function Labels: IModelHTMLLegendLabels<IModelHTMLLegend>;
+    function Position: string; overload;
+    function Position(Value: string ): IModelHTMLLegend; overload;
+    function Result: string;
+  end;
+  IModelHTMLLegendLabels<T> = interface
+    ['{796188B6-4031-43E8-ABF1-43D6C8E1B18D}']
+    function FontSize(Value: Integer): IModelHTMLLegendLabels<T>; overload;
+    function FontSize: Integer; overload;
+    function FontStyle(Value: string ): IModelHTMLLegendLabels<T>; overload;
+    function FontStyle: string; overload;
+    function FontColorHEX(Value: string ): IModelHTMLLegendLabels<T>; overload;
+    function FontColorHEX: string; overload;
+    function FontFamily(Value: string ): IModelHTMLLegendLabels<T>; overload;
+    function FontFamily: string; overload;
+    function Padding(Value: Integer ): IModelHTMLLegendLabels<T>; overload;
+    function Padding: Integer; overload;
+    function Result: string;
+    function &End: T;
+  end;
+  IModelLabellingConfig<T> = interface(IInterface)
+    ['{4BBEDE9F-9F02-4E92-AFA4-3B301DEC6672}']
+    function &End: T;
+    function FontFamily: string; overload;
+    function FontFamily(Value: string): IModelLabellingConfig<T>; overload;
+    function FontSize: Integer; overload;
+    function FontSize(Value: Integer): IModelLabellingConfig<T>; overload;
+    function FontStyle: string; overload;
+    function FontStyle(Value: string): IModelLabellingConfig<T>; overload;
+    function Format: string; overload;
+    function Format(Value: string): IModelLabellingConfig<T>; overload;
+    function HideZeroValues(Value: Boolean): IModelLabellingConfig<T>; overload;
+    function Padding: Integer; overload;
+    function Padding(Value: Integer): IModelLabellingConfig<T>; overload;
+    function PaddingX: Integer; overload;
+    function PaddingX(Value: Integer): IModelLabellingConfig<T>; overload;
+    function Result: string;
+    function RGBColor: string; overload;
+    function RGBColor(Value: string ): IModelLabellingConfig<T>; overload;
+  end;
+
+  IModelHTMLChartsAxes = interface(IInterface)
+    ['{2E97CD69-FDAC-4A01-ADA6-0EA9F1FFFF7C}']
+    function &End: IModelHTMLScales;
+    function Result: string;
+    function XAxe: IModelHTMLChartsAxesParam;
+    function YAxe: IModelHTMLChartsAxesParam;
+  end;
+
+  IModelHTMLChartsAxesParam = interface(IInterface)
+    ['{E4C5DE93-B372-4D75-ADD2-8A3D1F30223E}']
+    function &End: IModelHTMLChartsAxes;
+    function GridLines: IModelHTMLChartsAxesGridLines<IModelHTMLChartsAxesParam>;
+    function OffSet: Boolean; overload;
+    function OffSet(Value: Boolean): IModelHTMLChartsAxesParam; overload;
+    function Position: string; overload;
+    function Position(Value: string): IModelHTMLChartsAxesParam; overload;
+    function RealTime: IModelHTMLChartsAxesParamRealTime;
+    function Result: string;
+    function ScaleLabel: IModelHTMLChatsAxesScaleLabel<IModelHTMLChartsAxesParam>;
+    function Stacked: Boolean; overload;
+    function Stacked(Value: Boolean ): IModelHTMLChartsAxesParam; overload;
+    function Ticks: IModelHTMLChartsAxesTicks<IModelHTMLChartsAxesParam>;
+    function _Type: string; overload;
+    function _Type(Value: string): IModelHTMLChartsAxesParam; overload;
+  end;
+
+  IModelHTMLChartsAxesParamRealTime = interface(IInterface)
+    ['{448ECDC3-69C1-44F3-B5C5-6C2336F60321}']
+    function &End: IModelHTMLChartsAxesParam;
+    function Delay(Value: Integer): IModelHTMLChartsAxesParamRealTime;
+    function Duration(Value: Integer): IModelHTMLChartsAxesParamRealTime;
+    function Refresh(Value: Integer): IModelHTMLChartsAxesParamRealTime;
+    function Result: string;
+    function Ttl(Value: Integer): IModelHTMLChartsAxesParamRealTime;
+  end;
+
+  IModelHTMLChatsAxesScaleLabel<T> = interface(IInterface)
+    ['{FC645855-267C-4876-8BE2-EE540732C6A5}']
+    function &End: T;
+    function Display: Boolean; overload;
+    function Display(Value: Boolean): IModelHTMLChatsAxesScaleLabel<T>; overload;
+    function FontColorHEX: string; overload;
+    function FontColorHEX(Value: string ): IModelHTMLChatsAxesScaleLabel<T>; overload;
+    function FontFamily: string; overload;
+    function FontFamily(Value: string ): IModelHTMLChatsAxesScaleLabel<T>; overload;
+    function FontSize: Integer; overload;
+    function FontSize(Value: Integer): IModelHTMLChatsAxesScaleLabel<T>; overload;
+    function FontStyle: string; overload;
+    function FontStyle(Value: string): IModelHTMLChatsAxesScaleLabel<T>; overload;
+    function LabelString: string; overload;
+    function LabelString(Value: string ): IModelHTMLChatsAxesScaleLabel<T>; overload;
+    function Padding: Integer; overload;
+    function Padding(Value: Integer ): IModelHTMLChatsAxesScaleLabel<T>; overload;
+    function Result: string;
+  end;
+
+  IModelHTMLChartsAxesGridLines<T> = interface(IInterface)
+    ['{F9043117-4398-478D-8EA2-8E5E065FB142}']
+    function &End: T;
+    function Circular: Boolean; overload;
+    function Circular(Value: Boolean): IModelHTMLChartsAxesGridLines<T>; overload;
+    function ColorRGBA: string; overload;
+    function ColorRGBA(Value: string ): IModelHTMLChartsAxesGridLines<T>; overload;
+    function Display: Boolean; overload;
+    function Display(Value: Boolean): IModelHTMLChartsAxesGridLines<T>; overload;
+    function DrawBorder: Boolean; overload;
+    function DrawBorder(Value: Boolean ): IModelHTMLChartsAxesGridLines<T>; overload;
+    function DrawOnChartArea: Boolean; overload;
+    function DrawOnChartArea(Value: Boolean): IModelHTMLChartsAxesGridLines<T>; overload;
+    function DrawTicks: Boolean; overload;
+    function DrawTicks(Value: Boolean): IModelHTMLChartsAxesGridLines<T>; overload;
+    function Result: string;
+    function TickMarkLength: Integer; overload;
+    function TickMarkLength(Value: Integer ): IModelHTMLChartsAxesGridLines<T>; overload;
+    function ZeroLineColorRGBA: string; overload;
+    function ZeroLineColorRGBA(Value: string ): IModelHTMLChartsAxesGridLines<T>; overload;
+    function ZeroLineWidth: Integer; overload;
+    function ZeroLineWidth(Value: Integer ): IModelHTMLChartsAxesGridLines<T>; overload;
+  end;
+
+  IModelHTMLChartsAxesTicks<T> = interface(IInterface)
+    ['{C56445FE-00C6-47E1-8B38-F0FE57419A71}']
+    function &End: T;
+    function AutoSkip: Boolean; overload;
+    function AutoSkip(Value: Boolean): IModelHTMLChartsAxesTicks<T>; overload;
+    function AutoSkipPadding: Integer; overload;
+    function AutoSkipPadding(Value: Integer): IModelHTMLChartsAxesTicks<T>; overload;
+    function BeginAtZero(Value: Boolean): IModelHTMLChartsAxesTicks<T>;
+    function FontColor: string; overload;
+    function FontColor(Value: string): IModelHTMLChartsAxesTicks<T>; overload;
+    function FontFamily: string; overload;
+    function FontFamily(Value: string): IModelHTMLChartsAxesTicks<T>; overload;
+    function FontSize: integer; overload;
+    function FontSize(Value: integer): IModelHTMLChartsAxesTicks<T>; overload;
+    function Format: string; overload;
+    function Format(Value: string): IModelHTMLChartsAxesTicks<T>; overload;
+    function LabelOffset: Integer; overload;
+    function LabelOffset(Value: Integer): IModelHTMLChartsAxesTicks<T>; overload;
+    function Max(Value: string): IModelHTMLChartsAxesTicks<T>;
+    function MaxRotation: Integer; overload;
+    function MaxRotation(Value: Integer): IModelHTMLChartsAxesTicks<T>; overload;
+    function MaxTicksLimit(Value: string): IModelHTMLChartsAxesTicks<T>;
+    function Min(Value: string): IModelHTMLChartsAxesTicks<T>;
+    function MinRotation: Integer; overload;
+    function MinRotation(Value: Integer): IModelHTMLChartsAxesTicks<T>; overload;
+    function Mirror: Boolean; overload;
+    function Mirror(Value: Boolean): IModelHTMLChartsAxesTicks<T>; overload;
+    function Padding: Integer; overload;
+    function Padding(Value: Integer): IModelHTMLChartsAxesTicks<T>; overload;
+    function Result: string;
+    function StepSize(Value: string): IModelHTMLChartsAxesTicks<T>;
+    function SuggestedMax(Value: string): IModelHTMLChartsAxesTicks<T>;
+    function SuggestedMin(Value: string): IModelHTMLChartsAxesTicks<T>;
+  end;
+
+  IModelHTMLDataSet = interface(IInterface)
+    ['{761961EF-0C2B-4B88-AC8F-B4806D530D07}']
+    function &End: IModelHTMLChartsConfig;
+    function BackgroundColor(Value: string): IModelHTMLDataSet;
+    function BackgroundOpacity(Value: Integer): IModelHTMLDataSet;
+    function BorderColor(Value: string): IModelHTMLDataSet;
+    function BorderDash(Lenght: Integer; Space: Integer): IModelHTMLDataSet;
+    function BorderOpacity(Value: Integer): IModelHTMLDataSet;
+    function BorderWidth(Value: Integer): IModelHTMLDataSet;
+    function Data(Value: string): IModelHTMLDataSet;
+    function DataSet(Value: TDataSet): IModelHTMLDataSet;
+    function Fill(Value: Boolean): IModelHTMLDataSet;
+    function Hidden(Value: Boolean): IModelHTMLDataSet;
+    function HideZeroValuesControl(Value: Boolean): IModelHTMLDataSet;
+    function LabelName(Value: string): IModelHTMLDataSet;
+    function LineTension(Value: Integer): IModelHTMLDataSet;
+    function RealTimeDataSet(Value: TDataSet): IModelHTMLDataSet;
+    function RealTimeInitialValue: string;
+    function ResultLabels: string;
+    function ResultScript: string;
+    function RGBName(Value: string): IModelHTMLDataSet;
+    function TextLabel(Value: string): IModelHTMLDataSet;
+    function Types(Value: string): IModelHTMLDataSet;
+    function ValueName(Value: string): IModelHTMLDataSet;
+  end;
+
+  IModelHTMLFactory = interface(IInterface)
+    ['{8CF35864-C906-4B8B-AC69-CD2F2001D906}']
+    function Charts(Parent: IModelHTML): IModelHTMLCharts;
+    function HTML: IModelHTML;
+    function Rows(Parent: IModelHTML): IModelHTMLRows;
+    function RowsTitle(Parent: IModelHTMLRows): IModelHTMLRowsTitle;
+    {$IFDEF FULL}
+    function Cards(Parent: IModelHTML): IModelCards;
+    function ChartEasyPie(Parent: IModelHTML): IModelChartEasyPie;
+    function Image(Parent: IModelHTML): IModelImage;
+    function Table(Parent: IModelHTML): IModelTable;
+    {$ENDIF}
+    end;
+
+  IModelColors<T> = interface(IInterface)
+    ['{8A6FA48B-BCB6-468B-A6EC-BC582B898E16}']
+    function &End: T;
+    function Danger: IModelColors<T>;
+    function Dark: IModelColors<T>;
+    function Info: IModelColors<T>;
+    function Light: IModelColors<T>;
+    function Primary: IModelColors<T>;
+    function Result: string;
+    function Secondary: IModelColors<T>;
+    function Success: IModelColors<T>;
+    function Warning: IModelColors<T>;
+  end;
+
+  IModelJumbotron = interface(IInterface)
+    ['{90EB606E-886D-4333-ADD4-3A723A4F989B}']
+    function Title(Value: string): IModelJumbotron;
+    function Description(Value: string): IModelJumbotron;
+    function &End: IModelHTML;
+  end;
+
+  IModelAlerts = interface(IInterface)
+    ['{F6967759-446A-42EF-9459-DE04C83BB65B}']
+    function Title(Value: string): IModelAlerts;
+    function AlertsClass: IModelAlertsClass;
+    function &End: IModelHTML;
+  end;
+
+  IModelAlertsClass = interface(IInterface)
+    ['{B877835D-FABB-4E0E-A44D-72DEC61B098B}']
+    function &End: IModelAlerts;
+    function Danger: IModelAlertsClass;
+    function Dark: IModelAlertsClass;
+    function Info: IModelAlertsClass;
+    function Light: IModelAlertsClass;
+    function Primary: IModelAlertsClass;
+    function ResultClass: string;
+    function Secondary: IModelAlertsClass;
+    function Success: IModelAlertsClass;
+    function Warning: IModelAlertsClass;
+  end;
+
+  IModelGenericDataSet<T> = interface(IInterface)
+    ['{761961EF-0C2B-4B88-AC8F-B4806D530D07}']
+    function &End: T;
+    function CallbackLink: TDictionary<string, string>; overload;
+    function CallbackLink(Field: string; MethodName: string): IModelGenericDataSet<T>; overload;
+    function DataSet: TDataSet; overload;
+    function DataSet(Value: TDataSet): IModelGenericDataSet<T>; overload;
+    function DataSetJstringify: string;
+    function LabelName: string; overload;
+    function LabelName(Value: string): IModelGenericDataSet<T>; overload;
+    function RGBName: string; overload;
+    function RGBName(Value: string): IModelGenericDataSet<T>; overload;
+    function ValueName: string; overload;
+    function ValueName(Value: string): IModelGenericDataSet<T>; overload;
+//    function textLabel(Value: string): IModelGenericDataSet<T>;
+//    function BackgroundColor(Value: string): IModelGenericDataSet<T>;
+//    function BorderColor(Value: string): IModelGenericDataSet<T>;
+//    function BorderWidth(Value: Integer): IModelGenericDataSet<T>;
+//    function Data(Value: string): IModelGenericDataSet<T>;
+//    function Fill(Value: Boolean): IModelGenericDataSet<T>;
+//    function ResultLabels: string;
+//    function Types(Value: string): IModelGenericDataSet<T>;
+   end;
+
+  IModelListGroup = interface(IInterface)
+    ['{4E7BC346-00A5-4B5C-92A2-348107CFEADA}']
+    function &End: IModelHTML;
+    function DataSet: IModelGenericDataSet<IModelListGroup>;
+    function ListGroupType: IModelListGroupClass;
+  end;
+
+  IModelListGroupClass = interface(IInterface)
+    ['{9DE42B06-A698-437D-B25D-2A6CB8A9B409}']
+    function &End: IModelListGroup;
+    function Action: IModelListGroupClass;
+    function Basic: IModelListGroupClass;
+    function ClassType: string;
+    function ElementIn: string;
+    function ElementOut: string;
+    function Flush: IModelListGroupClass;
+    function Horizontal: IModelListGroupClass;
+    function TagIn: string;
+  end;
+
+  IModelGenericList<T> = interface(IInterface)
+    ['{BCF34A04-11DC-437B-BACA-97FBB4F0C7AF}']
+    function &End: T;
+    function Add(Value: string): IModelGenericList<T>;
+    function List: TList<string>;
+  end;
+
+  IModelPivotTableConfig = interface(IInterface)
+    ['{B5F32DE7-8BEA-40B3-92B6-5AD7EA2BB3FE}']
+    function &End: IModelPivotTable;
+    function Cols: IModelGenericList<IModelPivotTableConfig>;
+    function ConfigBackgroundColor(Value: string): IModelPivotTableConfig;
+    function ConfigBodyStyle: IModelGenericStyle<IModelPivotTableConfig>;
+    function ConfigHeadStyle: IModelGenericStyle<IModelPivotTableConfig>;
+    function DataSet: IModelGenericDataSet<IModelPivotTableConfig>;
+    function PivotOptions: string; overload;
+    function PivotOptions(Value: string): IModelPivotTableConfig; overload;
+    function PivotType: IModelPivotTableClass;
+    function ResultData: string;
+    function ResultStyle: string;
+    function Rows: IModelGenericList<IModelPivotTableConfig>;
+    function ShowPivotUI: string; overload;
+    function ShowPivotUI(Value: Boolean): IModelPivotTableConfig; overload;
+  end;
+
+  IModelJSCommand = interface(IInterface)
+    ['{60141CC4-A117-4500-B28E-C09B2339E6B8}']
+    function Callback: TProc<string>; overload;
+    function Callback(Value: TProc<string>): IModelJSCommand; overload;
+    function Command(Value: string):IModelJSCommand;
+    function Paramters: IModelGenericList<IModelJSCommand>; overload;
+    function ResultCommand: string; overload;
+    function TagAttribute: string; overload;
+    function TagAttribute(Value: string): IModelJSCommand; overload;
+    function TagID: string; overload;
+    function TagID(Value: string): IModelJSCommand; overload;
+    function TagName: string; overload;
+    function TagName(Value: string):IModelJSCommand; overload;
+    function TestBeforeExecute(Value: Boolean): IModelJSCommand;
+  end;
+
+  IModelPivotTable = interface(IInterface)
+    ['{D9C25BD4-9C5F-4F8C-AFA7-D251193609A9}']
+    function &End: IModelHTML;
+    function Attributes: IModelPivotTableConfig;
+    function HideUI: IModelPivotTable;
+    function LoadConfig(Value: string): IModelPivotTable;
+    function SaveConfig: string; overload;
+    function SaveConfig(Value: TProc<string>): IModelPivotTable; overload;
+    function ShowUI: IModelPivotTable;
+  end;
+
+  IModelPivotTableClass = interface(IInterface)
+    ['{B5695B31-A3C9-45A4-86D8-3542736EC848}']
+    function &End: IModelPivotTableConfig;
+    function BarrasHorizontais: IModelPivotTableClass;
+    function BarrasHorizontaisEmpilhadas: IModelPivotTableClass;
+    function GraficoDeArea: IModelPivotTableClass;
+    function GraficoDeBarras: IModelPivotTableClass;
+    function GraficoDeBarrasEmpilhadas: IModelPivotTableClass;
+    function GraficoDeLinhas: IModelPivotTableClass;
+    function GraficoDePizzaMultiplo: IModelPivotTableClass;
+    function MapaDeCalor: IModelPivotTableClass;
+    function MapaDeCalorPorColunas: IModelPivotTableClass;
+    function MapaDeCalorPorLinhas: IModelPivotTableClass;
+    function ResultClass: string;
+    function Tabela: IModelPivotTableClass;
+    function TabelaComBarras: IModelPivotTableClass;
+  end;
+
+  IModelGenericStyle<T> = interface(IInterface)
+  ['{C98A4A18-4BA5-45E1-B442-0D728E7138E3}']
+    function &End: T;
+    function AlignItems: string; overload;
+    function AlignItems(Value: string): IModelGenericStyle<T>; overload;
+    function Background: string; overload;
+    function Background(Value: string): IModelGenericStyle<T>; overload;
+    function BackgroundColor: string; overload;
+    function BackgroundColor(Value: string): IModelGenericStyle<T>; overload;
+    function Color: string; overload;
+    function Color(Value: string): IModelGenericStyle<T>; overload;
+    function Display: string; overload;
+    function Display(Value: string): IModelGenericStyle<T>; overload;
+    function FontFamily: string; overload;
+    function FontFamily(Value: string): IModelGenericStyle<T>; overload;
+    function FontSize: string; overload;
+    function FontSize(Value: Integer): IModelGenericStyle<T>; overload;
+    function FontSize(Value: string): IModelGenericStyle<T>; overload;
+    function FontWeight: string; overload;
+    function FontWeight(Value: string): IModelGenericStyle<T>; overload;
+    function Height: string; overload;
+    function Height(Value: Integer): IModelGenericStyle<T>; overload;
+    function Height(Value: string): IModelGenericStyle<T>; overload;
+    function JustifyContent: string; overload;
+    function JustifyContent(Value: string): IModelGenericStyle<T>; overload;
+    function LineHeight: string; overload;
+    function LineHeight(Value: Integer): IModelGenericStyle<T>; overload;
+    function LineHeight(Value: string): IModelGenericStyle<T>; overload;
+    function MarginLeft: string; overload;
+    function MarginLeft(Value: Integer): IModelGenericStyle<T>; overload;
+    function MarginLeft(Value: string): IModelGenericStyle<T>; overload;
+    function Opacity: string; overload;
+    function Opacity(Value: string): IModelGenericStyle<T>; overload;
+    function Padding: string; overload;
+    function Padding(Value: Integer): IModelGenericStyle<T>; overload;
+    function Padding(Value: string): IModelGenericStyle<T>; overload;
+    function Position: string; overload;
+    function Position(Value: string): IModelGenericStyle<T>; overload;
+    function ResultStyle: string;
+    function Right: string; overload;
+    function Right(Value: Integer): IModelGenericStyle<T>; overload;
+    function Right(Value: string): IModelGenericStyle<T>; overload;
+    function TextAlign: string; overload;
+    function TextAlign(Value: string): IModelGenericStyle<T>; overload;
+    function Top: string; overload;
+    function Top(Value: Integer): IModelGenericStyle<T>; overload;
+    function Top(Value: string): IModelGenericStyle<T>; overload;
+    function VerticalAlign: string; overload;
+    function VerticalAlign(Value: string): IModelGenericStyle<T>; overload;
+    function Width: string; overload;
+    function Width(Value: Integer): IModelGenericStyle<T>; overload;
+    function Width(Value: string): IModelGenericStyle<T>; overload;
+  end;
+
+  IModelGenericCoordinates<T> = interface(IInterface)
+    ['{AE9131DA-6C0D-4A8F-876F-9D86EA6794E7}']
+    function &End: T;
+    function Latitude: string; overload;
+    function Latitude(Value: string): IModelGenericCoordinates<T>; overload;
+    function Longitude: string; overload;
+    function Longitude(Value: string): IModelGenericCoordinates<T>; overload;
+  end;
+
+  {$IFDEF FULL}
+
+  IModelHTMLRowsP = interface(IInterface)
+    ['{F26E4162-73CC-40E9-8E35-9499B6D61673}']
+    function &End: IModelHTMLRows;
+    function Add(Value: string): iModelHTMLRowsP;
+    function ID(Value: string): IModelHTMLRowsP;
+    function _Class(Value: string): IModelHTMLRowsP;
+  end;
+
+  IModelTable = interface(IInterface)
+    ['{D0151987-64C8-40E2-A83C-18AF9648F8AE}']
+    function &End: IModelHTML;
+    function DataSet: IModelTableDataSet;
+    function Datatable(Value: Boolean): IModelTable;
+    function TableClass: IModelTableClass;
+    function TableData: IModelTableData;
+    function TableFeatures: IModelTableFeatures;
+    function TableOptions: IModelTableOption;
+  end;
+
+  IModelTableClass = interface(IInterface)
+    ['{AC891435-E424-4C9D-BC69-4B05A705B96E}']
+    function &EndTableClass: IModelTable;
+    function TableBordered: IModelTableClass;
+    function TableDark: IModelTableClass;
+    function TableHover: IModelTableClass;
+    function TableResponsive: IModelTableClass;
+    function TableSm: IModelTableClass;
+    function TableStriped: IModelTableClass;
+  end;
+
+  IModelTableDataSet = interface(IInterface)
+    ['{061B2938-6100-42AF-8EE4-D5895E5A38B8}']
+    function &End: IModelTable;
+    function Action: IModelTableAction;
+    function ActionDelete: IModelTableAction;
+    function ActionEdit: IModelTableAction;
+    function CallbackLink(Field: string; MethodName: string): IModelTableDataSet; overload;
+    function CallbackLink(Field: string; MethodName: string; AValue: string): IModelTableDataSet; overload;
+    function DataSet(Value: TDataSet): IModelTableDataSet;
+    function ResultScript: string;
+    function ResultStyle: string;
+  end;
+
+  IModelTableActionImage = Interface(IInterface)
+    ['{60D2D1F0-B0F7-404D-8681-B9EBE36FFEB2}']
+    function &End: IModelTableAction;
+    function Height: string; overload;
+    function Height(Value: Integer): IModelTableActionImage; overload;
+    function Image: string; overload;
+    function Image(Value: string): IModelTableActionImage; overload;
+    function Image(Value: TCustomMemoryStream): IModelTableActionImage; overload;
+    function StyleClass: string;
+    function Tooltip: string overload;
+    function Tooltip(Value: string): IModelTableActionImage; overload;
+    function Width: string; overload;
+    function Width(Value: Integer): IModelTableActionImage; overload;
+  end;
+
+  IModelTableAction = interface(IInterface)
+    ['{D9476DEA-F074-4A7B-9472-B7A9872F7023}']
+    function &End: IModelTableDataSet;
+    function ActionHeader: string; overload;
+    function ActionHeader(Value: string): IModelTableAction; overload;
+    function CallbackLink(Field: string; MethodName: string): IModelTableAction;
+    function FieldName: string;
+    function Image: IModelTableActionImage;
+    function ImageTag: string;
+    function MethodName: string;
+    function ResultStyle: string;
+  end;
+
+  IModelTableOption = interface(IInterface)
+    ['{2DFF85D5-1116-4160-AAE4-8A5172B8EFD8}']
+    function &End: IModelTable;
+    //1 Atraso no carregamento dos dados do servidor até o segundo sorteio
+    function DeferLoading(Value: Integer): IModelTableOption;
+    //1 Ponto inicial de paginação inicial
+    function DisplayStart(Value: Integer): IModelTableOption;
+    //1 Altere as opções na selectlista de comprimento da página .
+    function LengthMenu(Value: string): IModelTableOption;
+    //1 DOM Id
+    function Name: string; overload;
+    //1 DOM Id
+    function Name(Value: string): IModelTableOption; overload;
+    //1 Destrua qualquer tabela existente que corresponda ao seletor e substitua pelas novas opções.
+    function OpDestroy(Value: Boolean): IModelTableOption;
+    //1 Ordem inicial(classificação)a ser aplicada à tabela
+    function Order(Value: string): IModelTableOption;
+    //1 Controlar em qual célula o manipulador de eventos do pedido será aplicado em uma coluna
+    function OrderCellsTop(Value: Boolean): IModelTableOption;
+    //1 Destaque as colunas que estão sendo ordenadas no corpo da tabela
+    function OrderClasses(Value: Boolean): IModelTableOption;
+    //1 Ordenação para sempre ser aplicada à tabela
+    function OrderFixed(Value: string): IModelTableOption;
+    //1 Controle de capacidade de ordenação de várias colunas.
+    function OrderMulti(Value: Boolean): IModelTableOption;
+    //1 Alterar o comprimento da página inicial(número de linhas por página)
+    function PageLength(Value: Integer): IModelTableOption;
+    //1 Opções de exibição do botão de paginação
+    function PagingType(Value: string): IModelTableOption;
+    //1 Habilitar e configurar a extensão responsiva para DataTables
+    function Responsive(Value: Boolean): IModelTableOption;
+    function Result: string;
+    //1 Recuperar uma instância existente do DataTables
+    function Retrieve(Value: Boolean): IModelTableOption;
+    //1 Permita que a tabela reduza em altura quando um número limitado de linhas for mostrado.
+    function ScrollCollapse(Value: Boolean): IModelTableOption;
+  end;
+
+  IModelTableFeatures = interface(IInterface)
+    ['{3A297833-19EA-46CB-A10D-5AF1905791FC}']
+    function &End: IModelTable;
+    //1 Controle de recursos Tratamento de largura de colunas inteligentes do DataTables
+    function AutoWidth(Value: Boolean): IModelTableFeatures;
+    //1 Controle diferenciado renderização adiada para velocidade adicional de inicialização.
+    function DeferRender(Value: Boolean): IModelTableFeatures;
+    //1 Campo de exibição de informações da tabela de controle de recursos
+    function Info(Value: Boolean): IModelTableFeatures;
+    //1 O recurso controla a capacidade do usuário final de alterar o comprimento da exibição de paginação da tabela.
+    function LengthChange(Value: Boolean): IModelTableFeatures;
+    //1 Recursos de ordenação de controle de recursos(classificação)no DataTables.
+    function Ordering(Value: Boolean): IModelTableFeatures;
+    //1 Ativar ou desativar a paginação da tabela
+    function Paging(Value: Boolean): IModelTableFeatures;
+    //1 O recurso controla o indicador de processamento
+    function Processing(Value: Boolean): IModelTableFeatures;
+    function Result: string;
+    //1 rolagem horizontal
+    function ScrollX(Value: Boolean): IModelTableFeatures;
+    //1 rolagem vertical
+    function ScrollY(Value: Integer): IModelTableFeatures;
+    //1 Recursos de pesquisa(filtragem)de controle de recursos
+    function Searching(Value: Boolean): IModelTableFeatures;
+    //1 Controle de recurso Modo de processamento no lado do servidor do DataTables
+    function ServerSide(Value: Boolean): IModelTableFeatures;
+    //1 Economia de estado - restaura o estado da tabela no recarregamento da página.
+    function StateSave(Value: Boolean): IModelTableFeatures;
+  end;
+
+  IModelTableData = interface(IInterface)
+    ['{6241E52E-02AF-4395-B162-6FF6B5821A6C}']
+    function &End: IModelTable;
+    function Columns(Value: Array of string): IModelTableData;
+    function DataSrc(Value: string): IModelTableData;
+    function JType(Value: string): IModelTableData;
+    function Result: string;
+    function ResultTable: string;
+    function Server(Value: string): IModelTableData;
+  end;
+
+  IModelTableCallback = interface(IInterface)
+    ['{CB685C9B-1FC8-4C23-BECC-BFCBBAA99C37}']
+    function &End: IModelTable;
+    function FormatNumber(aCampo, aFormat: string): IModelTableCallback;
+    function Result: string;
+  end;
+
+  IModelHTMLRowsDiv = interface(IInterface)
+    ['{BD95F279-9614-47FD-B0AD-56B93279D4F1}']
+    function &End: IModelHTMLRows;
+    function Add(Value: string): IModelHTMLRowsDiv;
+    function ColSpan(Value: Integer): IModelHTMLRowsDiv;
+    function ID(Value: string): IModelHTMLRowsDiv;
+  end;
+
+  IModelCards = interface(IInterface)
+    ['{5BA3AF40-D673-44BA-BF79-5F35E0F00BFB}']
+    function &End: IModelHTML;
+    function Colors: IModelColors<IModelCards>;
+    function ColSpan: Integer; overload;
+    function ColSpan(Value: Integer): IModelCards; overload;
+    function DataSet: IModelCardsDataSet;
+    function FieldBody: string; overload;
+    function FieldBody(Value: string): IModelCards; overload;
+    function FieldHeader: string; overload;
+    function FieldHeader(Value: string): IModelCards; overload;
+    function FieldTitle: string; overload;
+    function FieldTitle(Value: string): IModelCards; overload;
+  end;
+
+  IModelCardsDataSet = interface(IInterface)
+    ['{E38197FC-8395-45BC-A0DE-D7283DD7E594}']
+    function &End: IModelCards;
+    function DataSet(Value: TDataSet): IModelCardsDataSet;
+    function ResultScript: string;
+  end;
+
+  ICallbackJS = interface(IInterface)
+    ['{B3DD9B36-2024-4763-96A3-DEC0F10F454A}']
+    function &End: IModelHTML;
+    function ClassProvider(Value: TObject): ICallbackJS;
+  end;
+
+  IChartsCallback = interface(IInterface)
+  ['{4040F646-6D4F-477A-B5CE-98FDD025DAEB}']
+    function IDChart(Value: string): IChartsCallback;
+    function Result(Value: string): string;
+  end;
+
+  IModelImage = interface(IInterface)
+    ['{477D75E4-1BEE-4E4B-B15F-80B92DA186EA}']
+    function &End: IModelHTML;
+    function DataSet: IModelImageDataSet;
+    function ImageClass: IModelImageClass;
+  end;
+
+  IModelImageDataSet = interface(IInterface)
+    ['{061B2938-6100-42AF-8EE4-D5895E5A38B8}']
+    function &End: IModelImage;
+    function DataSet(Value: TDataSet): IModelImageDataSet;
+    function Field(Value: string): IModelImageDataSet;
+    function ResultScript: string;
+  end;
+
+  IModelImageClass = interface(IInterface)
+    ['{9631B98F-CDE7-41A1-8138-E8E05AD72B65}']
+    function &End: IModelImage;
+    function DBlock: IModelImageClass;
+    function FloatLeft: IModelImageClass;
+    function FloatRight: IModelImageClass;
+    function ImgFluid: IModelImageClass;
+    function ImgThumbnail: IModelImageClass;
+    function MxAuto: IModelImageClass;
+    function ResultClass: string;
+    function Rounded: IModelImageClass;
+  end;
+
+  IModelButton = interface(IInterface)
+    ['{BF6585F7-1823-4604-8FE4-1305EF38833B}']
+    function &End: IModelHTML;
+    function ButtonClass: IModelButtonClass;
+    function CallbackLink(Param: string; Method: string): IModelButton;
+    function Title(Value: string): IModelButton;
+  end;
+
+  IModelButtonClass = interface(IInterface)
+    ['{E03B3D3A-2D23-4AC0-86E3-5C4F18B9A9CE}']
+    function &End: IModelButton;
+    function Active: IModelButtonClass;
+    function Block: IModelButtonClass;
+    function Danger: IModelButtonClass;
+    function Dark: IModelButtonClass;
+    function Disabled: IModelButtonClass;
+    function Info: IModelButtonClass;
+    function Large: IModelButtonClass;
+    function Light: IModelButtonClass;
+    function Outline: IModelButtonClass;
+    function Primary: IModelButtonClass;
+    function ResultClass: string;
+    function Secondary: IModelButtonClass;
+    function Small: IModelButtonClass;
+    function Success: IModelButtonClass;
+    function Warning: IModelButtonClass;
+  end;
+
+  IModelCSS = interface(IInterface)
+    ['{DBC52618-B95B-4871-9BC5-632B7737F2FD}']
+    function BackgroundColor(Value: string ):  IModelCSS;
+    function BorderColor(Value: string ): IModelCSS;
+    function CDN(Value: Boolean): IModelCSS;
+    function FontColor(Value: string ): IModelCSS;
+    function PackCSS: string;
+  end;
+
+  IModelJS = interface(IInterface)
+    ['{CB37AC61-A8D6-4CEB-BFD1-FDC26CDEB2AA}']
+    function CDN(Value: Boolean): IModelJS;
+    function Credenciais(Value: IModelCredenciais): IModelJS;
+    function PackJS: string;
+  end;
+
+  IModelChartEasyPie = interface(IInterface)
+    ['{236E2A17-A50A-4E23-A414-19A1E8A7B34E}']
+    function &End: IModelHTML;
+    function Animate(Value: string): IModelChartEasyPie;
+    function BarColor(Value: string): IModelChartEasyPie;
+    function DataPercent(Value: string): IModelChartEasyPie;
+    function LineCap(Value: string): IModelChartEasyPie;
+    function LinheWidth(Value: string): IModelChartEasyPie;
+    function OnStart(Value: string): IModelChartEasyPie;
+    function OnStep(Value: string): IModelChartEasyPie;
+    function OnStop(Value: string): IModelChartEasyPie;
+    function ScaleColor(Value: string): IModelChartEasyPie;
+    function Size(Value: string): IModelChartEasyPie;
+    function TrackColor(Value: string): IModelChartEasyPie;
+  end;
+
+  {$ENDIF}
+
+implementation
+
+end.
diff --git a/JQuery.UIJS.pas b/Source/JQuery.UIJS.pas
similarity index 100%
rename from JQuery.UIJS.pas
rename to Source/JQuery.UIJS.pas
diff --git a/JSCommand.pas b/Source/JSCommand.pas
similarity index 100%
rename from JSCommand.pas
rename to Source/JSCommand.pas
diff --git a/JqueryJS.pas b/Source/JqueryJS.pas
similarity index 100%
rename from JqueryJS.pas
rename to Source/JqueryJS.pas
diff --git a/Jumbotron.pas b/Source/Jumbotron.pas
similarity index 100%
rename from Jumbotron.pas
rename to Source/Jumbotron.pas
diff --git a/LiquidFillGauge.Config.pas b/Source/LiquidFillGauge.Config.pas
similarity index 100%
rename from LiquidFillGauge.Config.pas
rename to Source/LiquidFillGauge.Config.pas
diff --git a/LiquidFillGauge.pas b/Source/LiquidFillGauge.pas
similarity index 100%
rename from LiquidFillGauge.pas
rename to Source/LiquidFillGauge.pas
diff --git a/LiquidFillGaugeCSS.pas b/Source/LiquidFillGaugeCSS.pas
similarity index 100%
rename from LiquidFillGaugeCSS.pas
rename to Source/LiquidFillGaugeCSS.pas
diff --git a/LiquidFillGaugeJS.pas b/Source/LiquidFillGaugeJS.pas
similarity index 100%
rename from LiquidFillGaugeJS.pas
rename to Source/LiquidFillGaugeJS.pas
diff --git a/ListGroup.Classes.Generic.pas b/Source/ListGroup.Classes.Generic.pas
similarity index 100%
rename from ListGroup.Classes.Generic.pas
rename to Source/ListGroup.Classes.Generic.pas
diff --git a/ListGroup.Classes.pas b/Source/ListGroup.Classes.pas
similarity index 100%
rename from ListGroup.Classes.pas
rename to Source/ListGroup.Classes.pas
diff --git a/ListGroup.pas b/Source/ListGroup.pas
similarity index 100%
rename from ListGroup.pas
rename to Source/ListGroup.pas
diff --git a/Maps.Dataset.pas b/Source/Maps/Maps.Dataset.pas
similarity index 95%
rename from Maps.Dataset.pas
rename to Source/Maps/Maps.Dataset.pas
index 60894ac..8d56f48 100644
--- a/Maps.Dataset.pas
+++ b/Source/Maps/Maps.Dataset.pas
@@ -22,26 +22,26 @@   TModelMapsDataset<T : IInterface> = class(TInterfacedObject, iModelMapsDataSet
       FInfoName : String;
     public
       constructor Create(Parent : T);
-      destructor Destroy; override;
-      class function New(Parent : T) : iModelMapsDataSet<T>;
-      function DataSet (Value : TDataSet) : iModelMapsDataSet<T>; overload;
-      function LatName(Value : String) : iModelMapsDataSet<T>; overload;
-      function LngName(Value : String) : iModelMapsDataSet<T>; overload;
-      function LabelName(Value : String) : iModelMapsDataSet<T>; overload;
-      function ValueName(Value : String) : iModelMapsDataSet<T>; overload;
-      function AddressName(Value : String) : iModelMapsDataSet<T>; overload;
-      function IdAddressName(Value : String) : iModelMapsDataSet<T>; overload;
-      function InfoName(Value : String) : iModelMapsDataSet<T>; overload;
-      function DataSet : TDataSet; overload;
-      function LatName : String; overload;
-      function LngName : String; overload;
-      function LabelName : String; overload;
-      function ValueName : String; overload;
-      function AddressName : String; overload;
-      function IdAddressName : String; overload;
-      function InfoName : String; overload;
-      function &End : T;
-  end;
+      destructor Destroy; override;
+      class function New(Parent : T) : iModelMapsDataSet<T>;
+      function DataSet (Value : TDataSet) : iModelMapsDataSet<T>; overload;
+      function LatName(Value : String) : iModelMapsDataSet<T>; overload;
+      function LngName(Value : String) : iModelMapsDataSet<T>; overload;
+      function LabelName(Value : String) : iModelMapsDataSet<T>; overload;
+      function ValueName(Value : String) : iModelMapsDataSet<T>; overload;
+      function AddressName(Value : String) : iModelMapsDataSet<T>; overload;
+      function IdAddressName(Value : String) : iModelMapsDataSet<T>; overload;
+      function InfoName(Value : String) : iModelMapsDataSet<T>; overload;
+      function DataSet : TDataSet; overload;
+      function LatName : String; overload;
+      function LngName : String; overload;
+      function LabelName : String; overload;
+      function ValueName : String; overload;
+      function AddressName : String; overload;
+      function IdAddressName : String; overload;
+      function InfoName : String; overload;
+      function &End : T;
+  end;
 implementation
 
 uses
@@ -62,10 +62,10 @@ function TModelMapsDataset<T>.AddressName: String;
 constructor TModelMapsDataset<T>.Create(Parent: T);
 begin
   {$IF RTLVERSION > 27  }
-    TInjection.Weak(@FParent, Parent);
-  {$ELSE}
-    FParent := Parent;
-  {$IFEND}
+    TInjection.Weak(@FParent, Parent);
+  {$ELSE}
+    FParent := Parent;
+  {$IFEND}
   FLatName := 'Lat';
   FLngName := 'Lng';
   FLabelName := 'Label';
diff --git a/Maps.GMaps.Draw.Circle.pas b/Source/Maps/Maps.GMaps.Draw.Circle.pas
similarity index 100%
rename from Maps.GMaps.Draw.Circle.pas
rename to Source/Maps/Maps.GMaps.Draw.Circle.pas
diff --git a/Maps.GMaps.Draw.Marker.pas b/Source/Maps/Maps.GMaps.Draw.Marker.pas
similarity index 100%
rename from Maps.GMaps.Draw.Marker.pas
rename to Source/Maps/Maps.GMaps.Draw.Marker.pas
diff --git a/Maps.GMaps.Draw.pas b/Source/Maps/Maps.GMaps.Draw.pas
similarity index 100%
rename from Maps.GMaps.Draw.pas
rename to Source/Maps/Maps.GMaps.Draw.pas
diff --git a/Maps.GMaps.Layer.HeatMap.pas b/Source/Maps/Maps.GMaps.Layer.HeatMap.pas
similarity index 100%
rename from Maps.GMaps.Layer.HeatMap.pas
rename to Source/Maps/Maps.GMaps.Layer.HeatMap.pas
diff --git a/Maps.GMaps.Layer.pas b/Source/Maps/Maps.GMaps.Layer.pas
similarity index 100%
rename from Maps.GMaps.Layer.pas
rename to Source/Maps/Maps.GMaps.Layer.pas
diff --git a/Maps.GMaps.Options.pas b/Source/Maps/Maps.GMaps.Options.pas
similarity index 100%
rename from Maps.GMaps.Options.pas
rename to Source/Maps/Maps.GMaps.Options.pas
diff --git a/Maps.GMaps.pas b/Source/Maps/Maps.GMaps.pas
similarity index 100%
rename from Maps.GMaps.pas
rename to Source/Maps/Maps.GMaps.pas
diff --git a/Maps.Gmaps.Routes.Directions.Panel.pas b/Source/Maps/Maps.Gmaps.Routes.Directions.Panel.pas
similarity index 100%
rename from Maps.Gmaps.Routes.Directions.Panel.pas
rename to Source/Maps/Maps.Gmaps.Routes.Directions.Panel.pas
diff --git a/Maps.Gmaps.Routes.Directions.pas b/Source/Maps/Maps.Gmaps.Routes.Directions.pas
similarity index 100%
rename from Maps.Gmaps.Routes.Directions.pas
rename to Source/Maps/Maps.Gmaps.Routes.Directions.pas
diff --git a/Maps.Gmaps.Routes.pas b/Source/Maps/Maps.Gmaps.Routes.pas
similarity index 100%
rename from Maps.Gmaps.Routes.pas
rename to Source/Maps/Maps.Gmaps.Routes.pas
diff --git a/Maps.InfoWindow.pas b/Source/Maps/Maps.InfoWindow.pas
similarity index 100%
rename from Maps.InfoWindow.pas
rename to Source/Maps/Maps.InfoWindow.pas
diff --git a/Maps.pas b/Source/Maps/Maps.pas
similarity index 100%
rename from Maps.pas
rename to Source/Maps/Maps.pas
diff --git a/MomentJS.pas b/Source/MomentJS.pas
similarity index 100%
rename from MomentJS.pas
rename to Source/MomentJS.pas
diff --git a/NumberJS.pas b/Source/NumberJS.pas
similarity index 100%
rename from NumberJS.pas
rename to Source/NumberJS.pas
diff --git a/PackCss.pas b/Source/PackCss.pas
similarity index 100%
rename from PackCss.pas
rename to Source/PackCss.pas
diff --git a/PackJS.pas b/Source/PackJS.pas
similarity index 100%
rename from PackJS.pas
rename to Source/PackJS.pas
diff --git a/PivotTable.Classes.pas b/Source/PivotTable/PivotTable.Classes.pas
similarity index 100%
rename from PivotTable.Classes.pas
rename to Source/PivotTable/PivotTable.Classes.pas
diff --git a/PivotTable.Config.pas b/Source/PivotTable/PivotTable.Config.pas
similarity index 100%
rename from PivotTable.Config.pas
rename to Source/PivotTable/PivotTable.Config.pas
diff --git a/PivotTable.pas b/Source/PivotTable/PivotTable.pas
similarity index 100%
rename from PivotTable.pas
rename to Source/PivotTable/PivotTable.pas
diff --git a/PivotTableCSS.pas b/Source/PivotTable/PivotTableCSS.pas
similarity index 100%
rename from PivotTableCSS.pas
rename to Source/PivotTable/PivotTableCSS.pas
diff --git a/PivotTableJS.pas b/Source/PivotTable/PivotTableJS.pas
similarity index 100%
rename from PivotTableJS.pas
rename to Source/PivotTable/PivotTableJS.pas
diff --git a/PivotTablePlotlyJS.pas b/Source/PivotTable/PivotTablePlotlyJS.pas
similarity index 100%
rename from PivotTablePlotlyJS.pas
rename to Source/PivotTable/PivotTablePlotlyJS.pas
diff --git a/PivotTablePlotlyRendersJS.pas b/Source/PivotTable/PivotTablePlotlyRendersJS.pas
similarity index 100%
rename from PivotTablePlotlyRendersJS.pas
rename to Source/PivotTable/PivotTablePlotlyRendersJS.pas
diff --git a/PopperJS.pas b/Source/PopperJS.pas
similarity index 100%
rename from PopperJS.pas
rename to Source/PopperJS.pas
diff --git a/Progress.Info.Icon.pas b/Source/Progress.Info.Icon.pas
similarity index 100%
rename from Progress.Info.Icon.pas
rename to Source/Progress.Info.Icon.pas
diff --git a/Progress.Info.Text.pas b/Source/Progress.Info.Text.pas
similarity index 100%
rename from Progress.Info.Text.pas
rename to Source/Progress.Info.Text.pas
diff --git a/Progress.Info.pas b/Source/Progress.Info.pas
similarity index 100%
rename from Progress.Info.pas
rename to Source/Progress.Info.pas
diff --git a/Progress.pas b/Source/Progress.pas
similarity index 100%
rename from Progress.pas
rename to Source/Progress.pas
diff --git a/QuillDeltaConverter.pas b/Source/QuillDeltaConverter.pas
similarity index 100%
rename from QuillDeltaConverter.pas
rename to Source/QuillDeltaConverter.pas
diff --git a/QuillEditorCSS.pas b/Source/QuillEditorCSS.pas
similarity index 100%
rename from QuillEditorCSS.pas
rename to Source/QuillEditorCSS.pas
diff --git a/QuillEditorJS.pas b/Source/QuillEditorJS.pas
similarity index 100%
rename from QuillEditorJS.pas
rename to Source/QuillEditorJS.pas
diff --git a/RichTextEditor.Config.PrintHeader.Divv.pas b/Source/RichTextEditor/RichTextEditor.Config.PrintHeader.Divv.pas
similarity index 100%
rename from RichTextEditor.Config.PrintHeader.Divv.pas
rename to Source/RichTextEditor/RichTextEditor.Config.PrintHeader.Divv.pas
diff --git a/RichTextEditor.Config.PrintHeader.Image.pas b/Source/RichTextEditor/RichTextEditor.Config.PrintHeader.Image.pas
similarity index 100%
rename from RichTextEditor.Config.PrintHeader.Image.pas
rename to Source/RichTextEditor/RichTextEditor.Config.PrintHeader.Image.pas
diff --git a/RichTextEditor.Config.PrintHeader.Title.pas b/Source/RichTextEditor/RichTextEditor.Config.PrintHeader.Title.pas
similarity index 100%
rename from RichTextEditor.Config.PrintHeader.Title.pas
rename to Source/RichTextEditor/RichTextEditor.Config.PrintHeader.Title.pas
diff --git a/RichTextEditor.Config.PrintHeader.pas b/Source/RichTextEditor/RichTextEditor.Config.PrintHeader.pas
similarity index 100%
rename from RichTextEditor.Config.PrintHeader.pas
rename to Source/RichTextEditor/RichTextEditor.Config.PrintHeader.pas
diff --git a/RichTextEditor.Config.pas b/Source/RichTextEditor/RichTextEditor.Config.pas
similarity index 100%
rename from RichTextEditor.Config.pas
rename to Source/RichTextEditor/RichTextEditor.Config.pas
diff --git a/RichTextEditor.pas b/Source/RichTextEditor/RichTextEditor.pas
similarity index 100%
rename from RichTextEditor.pas
rename to Source/RichTextEditor/RichTextEditor.pas
diff --git a/Rows.Divv.pas b/Source/Rows/Rows.Divv.pas
similarity index 96%
rename from Rows.Divv.pas
rename to Source/Rows/Rows.Divv.pas
index 60be442..fd1648b 100644
--- a/Rows.Divv.pas
+++ b/Source/Rows/Rows.Divv.pas
@@ -1,85 +1,72 @@
-unit Rows.Divv;
-
-interface
-
-uses
-  Interfaces,
-  Generics.Collections,
-  SysUtils;
-
-Type
-  TModelHTMLRowsDiv = class(TInterfacedObject, IModelHTMLRowsDiv)
-    private
-      [weak]
-      FParent : IModelHTMLRows;
-      FID : string;
-      FLista : TList<String>;
-      FColSpan : String;
-    public
-      constructor Create(Parent : IModelHTMLRows);
-      destructor Destroy; override;
-      class function New(Parent : IModelHTMLRows)  : IModelHTMLRowsDiv;
-      function Add(Value : String) : IModelHTMLRowsDiv;
-      function ColSpan(Value : Integer) : IModelHTMLRowsDiv;
-      function ID(Value : string) : IModelHTMLRowsDiv;
-      function &End : IModelHTMLRows;
-  end;
-
-implementation
-
-uses
-  Injection;
-
-{ TModelHTMLRowsDiv }
-
-function TModelHTMLRowsDiv.Add(Value: String): IModelHTMLRowsDiv;
-begin
-  Result := Self;
-  FLista.Add(Value);
-end;
-
-function TModelHTMLRowsDiv.&End: IModelHTMLRows;
-var
-  I: Integer;
-begin
-  Result := FParent;
-  FParent.HTML('<div' + FID + FColSpan + '>');
-  for I := 0 to Pred(FLista.Count) do
-    FParent.HTML(FLista.Items[I]);
-  FParent.HTML('</div>');
-end;
-
-function TModelHTMLRowsDiv.ID(Value: string): IModelHTMLRowsDiv;
+unit Rows.Divv;
+interface
+uses
+  Interfaces,
+  Generics.Collections,
+  SysUtils;
+Type
+  TModelHTMLRowsDiv = class(TInterfacedObject, IModelHTMLRowsDiv)
+    private
+      [weak]
+      FParent : IModelHTMLRows;
+      FID : string;
+      FLista : TList<String>;
+      FColSpan : String;
+    public
+      constructor Create(Parent : IModelHTMLRows);
+      destructor Destroy; override;
+      class function New(Parent : IModelHTMLRows)  : IModelHTMLRowsDiv;
+      function Add(Value : String) : IModelHTMLRowsDiv;
+      function ColSpan(Value : Integer) : IModelHTMLRowsDiv;
+      function ID(Value : string) : IModelHTMLRowsDiv;
+      function &End : IModelHTMLRows;
+  end;
+implementation
+uses
+  Injection;
+{ TModelHTMLRowsDiv }
+function TModelHTMLRowsDiv.Add(Value: String): IModelHTMLRowsDiv;
+begin
+  Result := Self;
+  FLista.Add(Value);
+end;
+function TModelHTMLRowsDiv.&End: IModelHTMLRows;
+var
+  I: Integer;
+begin
+  Result := FParent;
+  FParent.HTML('<div' + FID + FColSpan + '>');
+  for I := 0 to Pred(FLista.Count) do
+    FParent.HTML(FLista.Items[I]);
+  FParent.HTML('</div>');
+end;
+function TModelHTMLRowsDiv.ID(Value: string): IModelHTMLRowsDiv;
 begin
   Result := Self;
   FID := Format(' id="%s"', [Value]);
 end;
 
-function TModelHTMLRowsDiv.ColSpan(Value: Integer): IModelHTMLRowsDiv;
-begin
-  Result := Self;
-  FColSpan := Format(' class="col-sm-%d"', [Value]);
-end;
-
-constructor TModelHTMLRowsDiv.Create(Parent : IModelHTMLRows);
-begin
-  {$IF RTLVERSION > 27  }
-    TInjection.Weak(@FParent, Parent);
-  {$ELSE}
-    FParent := Parent;
-  {$IFEND}
-  FLista := TList<String>.Create;
-end;
-
-destructor TModelHTMLRowsDiv.Destroy;
-begin
-  FLista.Free;
-  inherited;
-end;
-
-class function TModelHTMLRowsDiv.New(Parent : IModelHTMLRows)  : IModelHTMLRowsDiv;
-begin
-  Result := Self.Create(Parent);
-end;
-
-end.
+function TModelHTMLRowsDiv.ColSpan(Value: Integer): IModelHTMLRowsDiv;
+begin
+  Result := Self;
+  FColSpan := Format(' class="col-sm-%d"', [Value]);
+end;
+constructor TModelHTMLRowsDiv.Create(Parent : IModelHTMLRows);
+begin
+  {$IF RTLVERSION > 27  }
+    TInjection.Weak(@FParent, Parent);
+  {$ELSE}
+    FParent := Parent;
+  {$IFEND}
+  FLista := TList<String>.Create;
+end;
+destructor TModelHTMLRowsDiv.Destroy;
+begin
+  FLista.Free;
+  inherited;
+end;
+class function TModelHTMLRowsDiv.New(Parent : IModelHTMLRows)  : IModelHTMLRowsDiv;
+begin
+  Result := Self.Create(Parent);
+end;
+end.
diff --git a/Rows.P.pas b/Source/Rows/Rows.P.pas
similarity index 100%
rename from Rows.P.pas
rename to Source/Rows/Rows.P.pas
diff --git a/Rows.Tag.pas b/Source/Rows/Rows.Tag.pas
similarity index 100%
rename from Rows.Tag.pas
rename to Source/Rows/Rows.Tag.pas
diff --git a/Rows.Title.Config.pas b/Source/Rows/Rows.Title.Config.pas
similarity index 100%
rename from Rows.Title.Config.pas
rename to Source/Rows/Rows.Title.Config.pas
diff --git a/Rows.Title.pas b/Source/Rows/Rows.Title.pas
similarity index 100%
rename from Rows.Title.pas
rename to Source/Rows/Rows.Title.pas
diff --git a/Rows.pas b/Source/Rows/Rows.pas
similarity index 100%
rename from Rows.pas
rename to Source/Rows/Rows.pas
diff --git a/StyleCSS.pas b/Source/StyleCSS.pas
similarity index 100%
rename from StyleCSS.pas
rename to Source/StyleCSS.pas
diff --git a/Table.Action.Image.pas b/Source/Table/Table.Action.Image.pas
similarity index 95%
rename from Table.Action.Image.pas
rename to Source/Table/Table.Action.Image.pas
index b9996b7..435a043 100644
--- a/Table.Action.Image.pas
+++ b/Source/Table/Table.Action.Image.pas
@@ -1,26 +1,26 @@
-unit Table.Action.Image;
-
-interface
-
-uses
-  Interfaces, Classes;
-
-type
-  TModelTableActionImage = class(TInterfacedObject, iModelTableActionImage)
-    private
+unit Table.Action.Image;
+
+interface
+
+uses
+  Interfaces, Classes;
+
+type
+  TModelTableActionImage = class(TInterfacedObject, iModelTableActionImage)
+    private
       [weak]
       FParent : iModelTableAction;
       FImage : String;
       FWidth : Integer;
       FHeight : Integer;
       FTooltip : String;
-      FStyleClass : String;
-    public
-      constructor Create(Parent : iModelTableAction);
+      FStyleClass : String;
+    public
+      constructor Create(Parent : iModelTableAction);
       destructor Destroy; override;
       class function New(Parent : iModelTableAction) : iModelTableActionImage;
-      function Image (Value : TCustomMemoryStream) : iModelTableActionImage; overload;
-      function Image (Value : String) : iModelTableActionImage; overload;
+      function Image (Value : TCustomMemoryStream) : iModelTableActionImage; overload;
+      function Image (Value : String) : iModelTableActionImage; overload;
       function Width (Value : Integer) : iModelTableActionImage; overload;
       function Height (Value : Integer) : iModelTableActionImage; overload;
       function Tooltip (Value : String) : iModelTableActionImage; overload;
@@ -29,97 +29,98 @@   TModelTableActionImage = class(TInterfacedObject, iModelTableActionImage)
       function Height : String; overload;
       function Tooltip : String overload;
       function StyleClass : String; overload;
-
      function &End : iModelTableAction;
-
-  end;
-implementation
-
-uses
-  Injection,
-  Utilities.Encoder,
-  SysUtils;
-
-{ TModelTableActionImage }
-
-constructor TModelTableActionImage.Create(Parent: iModelTableAction);
-begin
-  TInjection.Weak(@FParent, Parent);
-  FWidth := 25;
-  FHeight := 25;
-  FStyleClass := 'img_' + IntToStr(Random(100));
-end;
-
-destructor TModelTableActionImage.Destroy;
-begin
-
-  inherited;
-end;
-
-function TModelTableActionImage.&End: iModelTableAction;
-begin
-  Result := FParent;
-end;
-
-function TModelTableActionImage.Height: String;
-begin
-  Result := 'height: ' + IntToStr(FHeight) + 'px;';
-end;
-
-function TModelTableActionImage.Image(Value: String): iModelTableActionImage;
-begin
- Result := Self;
- FImage := Value;
-end;
-
-function TModelTableActionImage.Height(Value: Integer): iModelTableActionImage;
-begin
-  Result := Self;
-  FHeight := Value;
-end;
-
-function TModelTableActionImage.Image(
-  Value: TCustomMemoryStream): iModelTableActionImage;
-begin
-  Result := Self;
-  FImage := TUtilitiesEncoder.ImageToBase64URI(Value);
-end;
-
-class function TModelTableActionImage.New(
-  Parent: iModelTableAction): iModelTableActionImage;
-begin
-  Result := Self.Create(Parent);
-end;
-
-function TModelTableActionImage.StyleClass: String;
-begin
-  Result := FStyleClass;
-end;
-
-function TModelTableActionImage.Tooltip: String;
-begin
-  Result := FTooltip;
-end;
-
-function TModelTableActionImage.Tooltip(Value: String): iModelTableActionImage;
-begin
-  Result := Self;
-  FToolTip := ' title="' + Value + '"';
-end;
-
-function TModelTableActionImage.Width: String;
-begin
-  Result := 'width: ' + IntToStr(FWidth) + 'px;';
-end;
-
-function TModelTableActionImage.Width(Value: Integer): iModelTableActionImage;
-begin
-  Result := Self;
-  FWidth := Value;
-end;
-
-function TModelTableActionImage.Image: String;
-begin
-  Result := FImage;
-end;
-
-end.
+
+      function &End : iModelTableAction;
+
+  end;
+implementation
+
+uses
+  Injection,
+  Utilities.Encoder,
+  SysUtils;
+
+{ TModelTableActionImage }
+
+constructor TModelTableActionImage.Create(Parent: iModelTableAction);
+begin
+  TInjection.Weak(@FParent, Parent);
+  FWidth := 25;
+  FHeight := 25;
+  FStyleClass := 'img_' + IntToStr(Random(100));
+end;
+
+destructor TModelTableActionImage.Destroy;
+begin
+
+  inherited;
+end;
+
+function TModelTableActionImage.&End: iModelTableAction;
+begin
+  Result := FParent;
+end;
+
+function TModelTableActionImage.Height: String;
+begin
+  Result := 'height: ' + IntToStr(FHeight) + 'px;';
+end;
+
+function TModelTableActionImage.Image(Value: String): iModelTableActionImage;
+begin
+ Result := Self;
+ FImage := Value;
+end;
+
+function TModelTableActionImage.Height(Value: Integer): iModelTableActionImage;
+begin
+  Result := Self;
+  FHeight := Value;
+end;
+
+function TModelTableActionImage.Image(
+  Value: TCustomMemoryStream): iModelTableActionImage;
+begin
+  Result := Self;
+  FImage := TUtilitiesEncoder.ImageToBase64URI(Value);
+end;
+
+class function TModelTableActionImage.New(
+  Parent: iModelTableAction): iModelTableActionImage;
+begin
+  Result := Self.Create(Parent);
+end;
+
+function TModelTableActionImage.StyleClass: String;
+begin
+  Result := FStyleClass;
+end;
+
+function TModelTableActionImage.Tooltip: String;
+begin
+  Result := FTooltip;
+end;
+
+function TModelTableActionImage.Tooltip(Value: String): iModelTableActionImage;
+begin
+  Result := Self;
+  FToolTip := ' title="' + Value + '"';
+end;
+
+function TModelTableActionImage.Width: String;
+begin
+  Result := 'width: ' + IntToStr(FWidth) + 'px;';
+end;
+
+function TModelTableActionImage.Width(Value: Integer): iModelTableActionImage;
+begin
+  Result := Self;
+  FWidth := Value;
+end;
+
+function TModelTableActionImage.Image: String;
+begin
+  Result := FImage;
+end;
+
+end.
diff --git a/Table.Action.pas b/Source/Table/Table.Action.pas
similarity index 100%
rename from Table.Action.pas
rename to Source/Table/Table.Action.pas
diff --git a/Table.Callback.pas b/Source/Table/Table.Callback.pas
similarity index 100%
rename from Table.Callback.pas
rename to Source/Table/Table.Callback.pas
diff --git a/Table.Classes.pas b/Source/Table/Table.Classes.pas
similarity index 100%
rename from Table.Classes.pas
rename to Source/Table/Table.Classes.pas
diff --git a/Table.Data.pas b/Source/Table/Table.Data.pas
similarity index 100%
rename from Table.Data.pas
rename to Source/Table/Table.Data.pas
diff --git a/Table.DataSet.pas b/Source/Table/Table.DataSet.pas
similarity index 100%
rename from Table.DataSet.pas
rename to Source/Table/Table.DataSet.pas
diff --git a/Table.Features.pas b/Source/Table/Table.Features.pas
similarity index 100%
rename from Table.Features.pas
rename to Source/Table/Table.Features.pas
diff --git a/Table.Features_old.pas b/Source/Table/Table.Features_old.pas
similarity index 100%
rename from Table.Features_old.pas
rename to Source/Table/Table.Features_old.pas
diff --git a/Table.Footer.Field.pas b/Source/Table/Table.Footer.Field.pas
similarity index 100%
rename from Table.Footer.Field.pas
rename to Source/Table/Table.Footer.Field.pas
diff --git a/Table.Footer.pas b/Source/Table/Table.Footer.pas
similarity index 100%
rename from Table.Footer.pas
rename to Source/Table/Table.Footer.pas
diff --git a/Table.Interfaces.pas b/Source/Table/Table.Interfaces.pas
similarity index 100%
rename from Table.Interfaces.pas
rename to Source/Table/Table.Interfaces.pas
diff --git a/Table.Options.pas b/Source/Table/Table.Options.pas
similarity index 100%
rename from Table.Options.pas
rename to Source/Table/Table.Options.pas
diff --git a/Table.Tipos.pas b/Source/Table/Table.Tipos.pas
similarity index 100%
rename from Table.Tipos.pas
rename to Source/Table/Table.Tipos.pas
diff --git a/Table.pas b/Source/Table/Table.pas
similarity index 100%
rename from Table.pas
rename to Source/Table/Table.pas
diff --git a/TetherminJS.pas b/Source/TetherminJS.pas
similarity index 100%
rename from TetherminJS.pas
rename to Source/TetherminJS.pas
diff --git a/Utilities.Encoder.pas b/Source/Utilities.Encoder.pas
similarity index 100%
rename from Utilities.Encoder.pas
rename to Source/Utilities.Encoder.pas
diff --git a/Utilities.Str.pas b/Source/Utilities.Str.pas
similarity index 100%
rename from Utilities.Str.pas
rename to Source/Utilities.Str.pas
diff --git a/UtilsJS.pas b/Source/UtilsJS.pas
similarity index 100%
rename from UtilsJS.pas
rename to Source/UtilsJS.pas
diff --git a/View.BarCharts.pas b/Source/View.BarCharts.pas
similarity index 100%
rename from View.BarCharts.pas
rename to Source/View.BarCharts.pas
diff --git a/View.Reg.pas b/Source/View.Reg.pas
similarity index 100%
rename from View.Reg.pas
rename to Source/View.Reg.pas
diff --git a/View.WebCharts.pas b/Source/View.WebCharts.pas
similarity index 68%
rename from View.WebCharts.pas
rename to Source/View.WebCharts.pas
index 840131b..d7c7ef5 100644
--- a/View.WebCharts.pas
+++ b/Source/View.WebCharts.pas
@@ -1,146 +1,125 @@
-unit View.WebCharts;
-
-interface
-
-uses
-  Interfaces,
-  Classes,
-  Generics.Collections,
-  SysUtils, Charts.Types,
-  Credenciais;
-
-Type
-
-  {$IF (RTLVERSION > 27) AND (RTLVERSION < 32) }[ComponentPlatformsAttribute(pidWin32 or pidWin64 or pidAndroid)]{$IFEND}
-  {$IF RTLVERSION > 32 }[ComponentPlatformsAttribute(pidWin32 or pidWin64 or pidAndroid32Arm)]{$IFEND}
-  TWebCharts = class(TComponent, iWebCharts)
-    private
-//      FModelHTML : iModelHTML;
-      FCss : TList<String>;
-      FFolderDefaultRWC: String;
-      FBackgroundColor : String;
-      FFontColor : String;
-      FContainerClass : TTypeContainer;
-      FCDN : Boolean;
-      FCredenciais : iModelCredenciais;
-    procedure SetFolderDefaultRWC(const Value: String);
-    public
-      constructor Create; reintroduce;
-      destructor Destroy; override;
-      class function New : iWebCharts;
-      function AddResource(Value : String) : iWebCharts;
-      function NewProject : iModelHTML; overload;
-      function NewProject(Container : Boolean) : iModelHTML; overload;
-      function ContinuosProject : iModelHTML;
-      function BackgroundColor(Value : String) : iWebCharts;
-      function FontColor(Value : String) : iWebCharts;
-      function Container(Value : TTypeContainer) : iWebCharts;
-      function CDN(Value : Boolean) : iWebCharts;
-      function Credenciais : iModelCredenciais;
-    published
-      property FolderDefaultRWC : String read FFolderDefaultRWC write SetFolderDefaultRWC;
-  end;
-
-implementation
-
-uses
-  HTML, TypInfo;
-
-{ TWebCharts }
-
-constructor TWebCharts.Create;
-begin
-//  FModelHTML := TModelHTML.New;
-  FCDN := False;
-end;
-
-function TWebCharts.Credenciais: iModelCredenciais;
+unit View.WebCharts;
+interface
+uses
+  Interfaces,
+  Classes,
+  Generics.Collections,
+  SysUtils, Charts.Types,
+  Credenciais;
+Type
+  {$IF (RTLVERSION > 27) AND (RTLVERSION < 32) }[ComponentPlatformsAttribute(pidWin32 or pidWin64 or pidAndroid)]{$IFEND}
+  {$IF RTLVERSION > 32 }[ComponentPlatformsAttribute(pidWin32 or pidWin64 or pidAndroid32Arm)]{$IFEND}
+  TWebCharts = class(TComponent, iWebCharts)
+    private
+//      FModelHTML : iModelHTML;
+      FCss : TList<String>;
+      FFolderDefaultRWC: string;
+      FBackgroundColor : String;
+      FFontColor : String;
+      FContainerClass : TTypeContainer;
+      FCDN : Boolean;
+      FCredenciais : iModelCredenciais;
+    procedure SetFolderDefaultRWC(const Value: string);
+    public
+      constructor Create; reintroduce;
+      destructor Destroy; override;
+      class function New : iWebCharts;
+      function AddResource(const Value: string): iWebCharts;
+      function NewProject : iModelHTML; overload;
+      function NewProject(const Container: Boolean): iModelHTML; overload;
+      function ContinuosProject : iModelHTML;
+      function BackgroundColor(const Value: string): iWebCharts;
+      function FontColor(const Value: string): iWebCharts;
+      function Container(const Value: TTypeContainer): iWebCharts;
+      function CDN(const Value: Boolean): iWebCharts;
+      function Credenciais : iModelCredenciais;
+    published
+      property FolderDefaultRWC: string read FFolderDefaultRWC write SetFolderDefaultRWC;
+  end;
+implementation
+uses
+  HTML, TypInfo;
+{ TWebCharts }
+constructor TWebCharts.Create;
+begin
+//  FModelHTML := TModelHTML.New;
+  FCDN := False;
+end;
+function TWebCharts.Credenciais: iModelCredenciais;
 begin
   FCredenciais := TModelCredenciais.New(Self);
   Result := FCredenciais;
 end;
 
-destructor TWebCharts.Destroy;
-begin
-  if Assigned(FCss) then
-    FreeAndNil(FCss);
-  inherited;
-end;
-
-function TWebCharts.FontColor(Value: String): iWebCharts;
-begin
-  Result := Self;
-  FFontColor := Value;
-end;
-
-function TWebCharts.AddResource(Value: String): iWebCharts;
-begin
-  Result := Self;
-  if not Assigned(FCss) then
-    FCss := TList<String>.Create;
-
-  FCss.Add(Value);
-end;
-
-function TWebCharts.BackgroundColor(Value: String): iWebCharts;
-begin
-  Result := Self;
-  FBackgroundColor := Value;
-end;
-
-function TWebCharts.CDN(Value: Boolean): iWebCharts;
-begin
-  Result := Self;
-  FCDN := Value;
-end;
-
-function TWebCharts.Container(Value: TTypeContainer): iWebCharts;
-begin
-  Result := Self;
-  FContainerClass := Value;
-end;
-
-function TWebCharts.ContinuosProject: iModelHTML;
-begin
- Result := TModelHTML.New;
-end;
-
-class function TWebCharts.New: iWebCharts;
-begin
-  Result := Self.Create;
-end;
-
-function TWebCharts.NewProject(Container: Boolean): iModelHTML;
-begin
-  Result := TModelHTML.New;
-  Result.ClearHTML;
-  Result.Credenciais(FCredenciais);
-  Result
-    .Container(Container)
-    .FolderDefaultRWC(FFolderDefaultRWC)
-    .BackgroundColor(FBackgroundColor)
-    .FontColor(FFontColor)
-    .GenerateHead(FCss);
-  Result.ContainerClass(FContainerClass);
-end;
-
-procedure TWebCharts.SetFolderDefaultRWC(const Value: String);
-begin
-  FFolderDefaultRWC := Value;
-end;
-
-function TWebCharts.NewProject: iModelHTML;
-begin
-  Result := TModelHTML.New;
-  Result.ClearHTML;
-  Result.CDN(FCDN);
-  Result.Credenciais(FCredenciais);
-  Result
-    .BackgroundColor(FBackgroundColor)
-    .FontColor(FFontColor)
-    .GenerateHead(FCss);
-  Result.ContainerClass(FContainerClass);
-  Result.FolderDefaultRWC(FFolderDefaultRWC);
-end;
-
-end.
+destructor TWebCharts.Destroy;
+begin
+  if Assigned(FCss) then
+    FreeAndNil(FCss);
+  inherited;
+end;
+function TWebCharts.FontColor(const Value: string): iWebCharts;
+begin
+  Result := Self;
+  FFontColor := Value;
+end;
+function TWebCharts.AddResource(const Value: string): iWebCharts;
+begin
+  Result := Self;
+  if not Assigned(FCss) then
+    FCss := TList<String>.Create;
+  FCss.Add(Value);
+end;
+function TWebCharts.BackgroundColor(const Value: string): iWebCharts;
+begin
+  Result := Self;
+  FBackgroundColor := Value;
+end;
+function TWebCharts.CDN(const Value: Boolean): iWebCharts;
+begin
+  Result := Self;
+  FCDN := Value;
+end;
+function TWebCharts.Container(const Value: TTypeContainer): iWebCharts;
+begin
+  Result := Self;
+  FContainerClass := Value;
+end;
+function TWebCharts.ContinuosProject: iModelHTML;
+begin
+ Result := TModelHTML.New;
+end;
+class function TWebCharts.New: iWebCharts;
+begin
+  Result := Self.Create;
+end;
+function TWebCharts.NewProject(const Container: Boolean): iModelHTML;
+begin
+  Result := TModelHTML.New;
+  Result.ClearHTML;
+  Result.Credenciais(FCredenciais);
+  Result
+    .Container(Container)
+    .FolderDefaultRWC(FFolderDefaultRWC)
+    .BackgroundColor(FBackgroundColor)
+    .FontColor(FFontColor)
+    .GenerateHead(FCss);
+  Result.ContainerClass(FContainerClass);
+end;
+procedure TWebCharts.SetFolderDefaultRWC(const Value: string);
+begin
+  FFolderDefaultRWC := Value;
+end;
+function TWebCharts.NewProject: iModelHTML;
+begin
+  Result := TModelHTML.New;
+  Result.ClearHTML;
+  Result.CDN(FCDN);
+  Result.Credenciais(FCredenciais);
+  Result
+    .BackgroundColor(FBackgroundColor)
+    .FontColor(FFontColor)
+    .GenerateHead(FCss);
+  Result.ContainerClass(FContainerClass);
+  Result.FolderDefaultRWC(FFolderDefaultRWC);
+end;
+end.
diff --git a/TBGWebCharts.dpk b/TBGWebCharts.dpk
index 960068e..9ef93b3 100644
--- a/TBGWebCharts.dpk
+++ b/TBGWebCharts.dpk
@@ -38,141 +38,141 @@ requires
   IndyCore;
 
 contains
-  Charts.Config in 'Charts.Config.pas',
-  Charts in 'Charts.pas',
-  HTML in 'HTML.pas',
-  Rows in 'Rows.pas',
-  Rows.Tag in 'Rows.Tag.pas',
-  Rows.Title.Config in 'Rows.Title.Config.pas',
-  Rows.Title in 'Rows.Title.pas',
-  View.Reg in 'View.Reg.pas',
-  View.WebCharts in 'View.WebCharts.pas',
-  Charts.DataSet in 'Charts.DataSet.pas',
-  Rows.Divv in 'Rows.Divv.pas',
-  Table.DataSet in 'Table.DataSet.pas',
-  Table in 'Table.pas',
-  Cards in 'Cards.pas',
-  Color in 'Color.pas',
-  Cards.DataSet in 'Cards.DataSet.pas',
-  Injection in 'Injection.pas',
-  Image in 'Image.pas',
-  Image.DataSet in 'Image.DataSet.pas',
-  Image.Classes in 'Image.Classes.pas',
-  Rows.P in 'Rows.P.pas',
-  PackCss in 'PackCss.pas',
-  PackJS in 'PackJS.pas',
-  Charts.Labelling in 'Charts.Labelling.pas',
-  Charts.Callback in 'Charts.Callback.pas',
-  NumberJS in 'NumberJS.pas',
-  Charts.Axes.Params in 'Charts.Axes.Params.pas',
-  Charts.Axes in 'Charts.Axes.pas',
-  Charts.Axes.Ticks in 'Charts.Axes.Ticks.pas',
-  Charts.Axes.GridLines in 'Charts.Axes.GridLines.pas',
-  Charts.Axes.ScaleLabel in 'Charts.Axes.ScaleLabel.pas',
-  Charts.Legends in 'Charts.Legends.pas',
-  Charts.Legends.Labels in 'Charts.Legends.Labels.pas',
-  Charts.Title in 'Charts.Title.pas',
-  Charts.Scales in 'Charts.Scales.pas',
-  Charts.Options in 'Charts.Options.pas',
-  Charts.Generic in 'Charts.Generic.pas',
-  Charts.Types in 'Charts.Types.pas',
-  Table.Options in 'Table.Options.pas',
-  DataTableJS in 'DataTableJS.pas',
-  DataTableCss in 'DataTableCss.pas',
-  BootstrapCss in 'BootstrapCss.pas',
-  Table.Data in 'Table.Data.pas',
-  Table.Features in 'Table.Features.pas',
-  Table.Callback in 'Table.Callback.pas',
-  Interfaces in 'Interfaces.pas',
-  StyleCSS in 'StyleCSS.pas',
-  Charts.Easy.Pie in 'Charts.Easy.Pie.pas',
-  Chart.Easy.PieJS in 'Chart.Easy.PieJS.pas',
-  Chart.Easy.PieCSS in 'Chart.Easy.PieCSS.pas',
-  Button in 'Button.pas',
-  Buttons.Classes in 'Buttons.Classes.pas',
-  Factory in 'Factory.pas',
-  Jumbotron in 'Jumbotron.pas',
-  Alerts in 'Alerts.pas',
-  Alerts.Classes in 'Alerts.Classes.pas',
-  CallBackJS in 'CallBackJS.pas',
-  ListGroup in 'ListGroup.pas',
-  ListGroup.Classes in 'ListGroup.Classes.pas',
-  Generic.DataSet in 'Generic.DataSet.pas',
-  PivotTable in 'PivotTable.pas',
-  Generic.List in 'Generic.List.pas',
-  PivotTable.Config in 'PivotTable.Config.pas',
-  Generic.Style in 'Generic.Style.pas',
-  JSCommand in 'JSCommand.pas',
-  PivotTableJS in 'PivotTableJS.pas',
-  JQuery.UIJS in 'JQuery.UIJS.pas',
-  PivotTableCSS in 'PivotTableCSS.pas',
-  BootstrapJS in 'BootstrapJS.pas',
-  PivotTablePlotlyJS in 'PivotTablePlotlyJS.pas',
-  PivotTablePlotlyRendersJS in 'PivotTablePlotlyRendersJS.pas',
-  PivotTable.Classes in 'PivotTable.Classes.pas',
-  Charts.Axes.Params.RealTime in 'Charts.Axes.Params.RealTime.pas',
-  MomentJS in 'MomentJS.pas',
-  ChartStreamJS in 'ChartStreamJS.pas',
-  Charts.Plugins in 'Charts.Plugins.pas',
-  UtilsJS in 'UtilsJS.pas',
-  FontawesomeallJS in 'FontawesomeallJS.pas',
-  JqueryJS in 'JqueryJS.pas',
-  PopperJS in 'PopperJS.pas',
-  TetherminJS in 'TetherminJS.pas',
-  ChartbundleJS in 'ChartbundleJS.pas',
-  Charts.Tooltip in 'Charts.Tooltip.pas',
-  Table.Action.Image in 'Table.Action.Image.pas',
-  Utilities.Encoder in 'Utilities.Encoder.pas',
-  Table.Action in 'Table.Action.pas',
-  GMapsJS in 'GMapsJS.pas',
-  Maps in 'Maps.pas',
-  Maps.GMaps in 'Maps.GMaps.pas',
-  Generic.Coordinates in 'Generic.Coordinates.pas',
-  Maps.GMaps.Options in 'Maps.GMaps.Options.pas',
-  Maps.Dataset in 'Maps.Dataset.pas',
-  Maps.GMaps.Draw in 'Maps.GMaps.Draw.pas',
-  Maps.GMaps.Draw.Marker in 'Maps.GMaps.Draw.Marker.pas',
-  Maps.GMaps.Draw.Circle in 'Maps.GMaps.Draw.Circle.pas',
-  Utilities.Str in 'Utilities.Str.pas',
-  Maps.GMaps.Layer in 'Maps.GMaps.Layer.pas',
-  Maps.GMaps.Layer.HeatMap in 'Maps.GMaps.Layer.HeatMap.pas',
-  Credenciais in 'Credenciais.pas',
-  Generic.Title in 'Generic.Title.pas',
-  Maps.Gmaps.Routes in 'Maps.Gmaps.Routes.pas',
-  Maps.Gmaps.Routes.Directions in 'Maps.Gmaps.Routes.Directions.pas',
-  Maps.Gmaps.Routes.Directions.Panel in 'Maps.Gmaps.Routes.Directions.Panel.pas',
-  Maps.InfoWindow in 'Maps.InfoWindow.pas',
-  Browser.VCL.WebBrowser in 'Browser.VCL.WebBrowser.pas',
-  D3JS in 'D3JS.pas',
-  LiquidFillGaugeJS in 'LiquidFillGaugeJS.pas',
-  LiquidFillGauge in 'LiquidFillGauge.pas',
-  LiquidFillGauge.Config in 'LiquidFillGauge.Config.pas',
-  LiquidFillGaugeCSS in 'LiquidFillGaugeCSS.pas',
-  CardStyled in 'CardStyled.pas',
-  CardStyled.IconRight in 'CardStyled.IconRight.pas',
-  CardStyled.Text in 'CardStyled.Text.pas',
-  CardStyled.Shape in 'CardStyled.Shape.pas',
-  CardStyled.Shape.Classes in 'CardStyled.Shape.Classes.pas',
-  DomElement in 'DomElement.pas',
-  CardStyled.IconLeft in 'CardStyled.IconLeft.pas',
-  QuillEditorJS in 'QuillEditorJS.pas',
-  QuillEditorCSS in 'QuillEditorCSS.pas',
-  RichTextEditor in 'RichTextEditor.pas',
-  RichTextEditor.Config in 'RichTextEditor.Config.pas',
-  QuillDeltaConverter in 'QuillDeltaConverter.pas',
-  RichTextEditor.Config.PrintHeader in 'RichTextEditor.Config.PrintHeader.pas',
-  RichTextEditor.Config.PrintHeader.Divv in 'RichTextEditor.Config.PrintHeader.Divv.pas',
-  RichTextEditor.Config.PrintHeader.Image in 'RichTextEditor.Config.PrintHeader.Image.pas',
-  RichTextEditor.Config.PrintHeader.Title in 'RichTextEditor.Config.PrintHeader.Title.pas',
-  CardStyled.IconBackground in 'CardStyled.IconBackground.pas',
-  Generic.ProgressBar in 'Generic.ProgressBar.pas',
-  Colors.Bootstrap in 'Colors.Bootstrap.pas',
-  Progress in 'Progress.pas',
-  CardStyled.Callback in 'CardStyled.Callback.pas',
-  Progress.Info in 'Progress.Info.pas',
-  Progress.Info.Text in 'Progress.Info.Text.pas',
-  Progress.Info.Icon in 'Progress.Info.Icon.pas',
-  ChartJSScript in 'ChartJSScript.pas';
+  Alerts.Classes in 'Source\Alerts.Classes.pas',
+  Alerts in 'Source\Alerts.pas',
+  BootstrapCss in 'Source\BootstrapCss.pas',
+  BootstrapJS in 'Source\BootstrapJS.pas',
+  Button in 'Source\Button.pas',
+  Buttons.Classes in 'Source\Buttons.Classes.pas',
+  CallBackJS in 'Source\CallBackJS.pas',
+  Cards.DataSet in 'Source\Cards.DataSet.pas',
+  Cards in 'Source\Cards.pas',
+  ChartbundleJS in 'Source\ChartbundleJS.pas',
+  ChartJSScript in 'Source\ChartJSScript.pas',
+  ChartStreamJS in 'Source\ChartStreamJS.pas',
+  Color in 'Source\Color.pas',
+  Colors.Bootstrap in 'Source\Colors.Bootstrap.pas',
+  Credenciais in 'Source\Credenciais.pas',
+  D3JS in 'Source\D3JS.pas',
+  DataTableCss in 'Source\DataTableCss.pas',
+  DataTableJS in 'Source\DataTableJS.pas',
+  DomElement in 'Source\DomElement.pas',
+  Factory in 'Source\Factory.pas',
+  FontawesomeallJS in 'Source\FontawesomeallJS.pas',
+  GMapsJS in 'Source\GMapsJS.pas',
+  HTML in 'Source\HTML.pas',
+  Image.Classes in 'Source\Image.Classes.pas',
+  Image.DataSet in 'Source\Image.DataSet.pas',
+  Image in 'Source\Image.pas',
+  Injection in 'Source\Injection.pas',
+  Interfaces in 'Source\Interfaces.pas',
+  JQuery.UIJS in 'Source\JQuery.UIJS.pas',
+  JqueryJS in 'Source\JqueryJS.pas',
+  JSCommand in 'Source\JSCommand.pas',
+  Jumbotron in 'Source\Jumbotron.pas',
+  LiquidFillGauge.Config in 'Source\LiquidFillGauge.Config.pas',
+  LiquidFillGauge in 'Source\LiquidFillGauge.pas',
+  LiquidFillGaugeCSS in 'Source\LiquidFillGaugeCSS.pas',
+  LiquidFillGaugeJS in 'Source\LiquidFillGaugeJS.pas',
+  ListGroup.Classes in 'Source\ListGroup.Classes.pas',
+  ListGroup in 'Source\ListGroup.pas',
+  MomentJS in 'Source\MomentJS.pas',
+  NumberJS in 'Source\NumberJS.pas',
+  PackCss in 'Source\PackCss.pas',
+  PackJS in 'Source\PackJS.pas',
+  PopperJS in 'Source\PopperJS.pas',
+  Progress.Info.Icon in 'Source\Progress.Info.Icon.pas',
+  Progress.Info in 'Source\Progress.Info.pas',
+  Progress.Info.Text in 'Source\Progress.Info.Text.pas',
+  Progress in 'Source\Progress.pas',
+  QuillDeltaConverter in 'Source\QuillDeltaConverter.pas',
+  QuillEditorCSS in 'Source\QuillEditorCSS.pas',
+  QuillEditorJS in 'Source\QuillEditorJS.pas',
+  StyleCSS in 'Source\StyleCSS.pas',
+  TetherminJS in 'Source\TetherminJS.pas',
+  Utilities.Encoder in 'Source\Utilities.Encoder.pas',
+  Utilities.Str in 'Source\Utilities.Str.pas',
+  UtilsJS in 'Source\UtilsJS.pas',
+  View.Reg in 'Source\View.Reg.pas',
+  View.WebCharts in 'Source\View.WebCharts.pas',
+  CardStyled.Callback in 'Source\CardStyled\CardStyled.Callback.pas',
+  CardStyled.IconBackground in 'Source\CardStyled\CardStyled.IconBackground.pas',
+  CardStyled.IconLeft in 'Source\CardStyled\CardStyled.IconLeft.pas',
+  CardStyled.IconRight in 'Source\CardStyled\CardStyled.IconRight.pas',
+  CardStyled in 'Source\CardStyled\CardStyled.pas',
+  CardStyled.Shape.Classes in 'Source\CardStyled\CardStyled.Shape.Classes.pas',
+  CardStyled.Shape in 'Source\CardStyled\CardStyled.Shape.pas',
+  CardStyled.Text in 'Source\CardStyled\CardStyled.Text.pas',
+  Chart.Easy.PieCSS in 'Source\CardStyled\Chart.Easy.PieCSS.pas',
+  Chart.Easy.PieJS in 'Source\CardStyled\Chart.Easy.PieJS.pas',
+  Charts.Axes.GridLines in 'Source\Charts\Charts.Axes.GridLines.pas',
+  Charts.Axes.Params in 'Source\Charts\Charts.Axes.Params.pas',
+  Charts.Axes.Params.RealTime in 'Source\Charts\Charts.Axes.Params.RealTime.pas',
+  Charts.Axes in 'Source\Charts\Charts.Axes.pas',
+  Charts.Axes.ScaleLabel in 'Source\Charts\Charts.Axes.ScaleLabel.pas',
+  Charts.Axes.Ticks in 'Source\Charts\Charts.Axes.Ticks.pas',
+  Charts.Callback in 'Source\Charts\Charts.Callback.pas',
+  Charts.Config in 'Source\Charts\Charts.Config.pas',
+  Charts.DataSet in 'Source\Charts\Charts.DataSet.pas',
+  Charts.Easy.Pie in 'Source\Charts\Charts.Easy.Pie.pas',
+  Charts.Generic in 'Source\Charts\Charts.Generic.pas',
+  Charts.Labelling in 'Source\Charts\Charts.Labelling.pas',
+  Charts.Legends.Labels in 'Source\Charts\Charts.Legends.Labels.pas',
+  Charts.Legends in 'Source\Charts\Charts.Legends.pas',
+  Charts.Options in 'Source\Charts\Charts.Options.pas',
+  Charts in 'Source\Charts\Charts.pas',
+  Charts.Plugins in 'Source\Charts\Charts.Plugins.pas',
+  Charts.Scales in 'Source\Charts\Charts.Scales.pas',
+  Charts.Title in 'Source\Charts\Charts.Title.pas',
+  Charts.Tooltip in 'Source\Charts\Charts.Tooltip.pas',
+  Charts.Types in 'Source\Charts\Charts.Types.pas',
+  Generic.Coordinates in 'Source\Generic\Generic.Coordinates.pas',
+  Generic.DataSet in 'Source\Generic\Generic.DataSet.pas',
+  Generic.List in 'Source\Generic\Generic.List.pas',
+  Generic.ProgressBar in 'Source\Generic\Generic.ProgressBar.pas',
+  Generic.Style in 'Source\Generic\Generic.Style.pas',
+  Generic.Title in 'Source\Generic\Generic.Title.pas',
+  Maps.Dataset in 'Source\Maps\Maps.Dataset.pas',
+  Maps.GMaps.Draw.Circle in 'Source\Maps\Maps.GMaps.Draw.Circle.pas',
+  Maps.GMaps.Draw.Marker in 'Source\Maps\Maps.GMaps.Draw.Marker.pas',
+  Maps.GMaps.Draw in 'Source\Maps\Maps.GMaps.Draw.pas',
+  Maps.GMaps.Layer.HeatMap in 'Source\Maps\Maps.GMaps.Layer.HeatMap.pas',
+  Maps.GMaps.Layer in 'Source\Maps\Maps.GMaps.Layer.pas',
+  Maps.GMaps.Options in 'Source\Maps\Maps.GMaps.Options.pas',
+  Maps.GMaps in 'Source\Maps\Maps.GMaps.pas',
+  Maps.Gmaps.Routes.Directions.Panel in 'Source\Maps\Maps.Gmaps.Routes.Directions.Panel.pas',
+  Maps.Gmaps.Routes.Directions in 'Source\Maps\Maps.Gmaps.Routes.Directions.pas',
+  Maps.Gmaps.Routes in 'Source\Maps\Maps.Gmaps.Routes.pas',
+  Maps.InfoWindow in 'Source\Maps\Maps.InfoWindow.pas',
+  Maps in 'Source\Maps\Maps.pas',
+  PivotTable.Classes in 'Source\PivotTable\PivotTable.Classes.pas',
+  PivotTable.Config in 'Source\PivotTable\PivotTable.Config.pas',
+  PivotTable in 'Source\PivotTable\PivotTable.pas',
+  PivotTableCSS in 'Source\PivotTable\PivotTableCSS.pas',
+  PivotTableJS in 'Source\PivotTable\PivotTableJS.pas',
+  PivotTablePlotlyJS in 'Source\PivotTable\PivotTablePlotlyJS.pas',
+  PivotTablePlotlyRendersJS in 'Source\PivotTable\PivotTablePlotlyRendersJS.pas',
+  RichTextEditor.Config in 'Source\RichTextEditor\RichTextEditor.Config.pas',
+  RichTextEditor.Config.PrintHeader.Divv in 'Source\RichTextEditor\RichTextEditor.Config.PrintHeader.Divv.pas',
+  RichTextEditor.Config.PrintHeader.Image in 'Source\RichTextEditor\RichTextEditor.Config.PrintHeader.Image.pas',
+  RichTextEditor.Config.PrintHeader in 'Source\RichTextEditor\RichTextEditor.Config.PrintHeader.pas',
+  RichTextEditor.Config.PrintHeader.Title in 'Source\RichTextEditor\RichTextEditor.Config.PrintHeader.Title.pas',
+  RichTextEditor in 'Source\RichTextEditor\RichTextEditor.pas',
+  Rows.Divv in 'Source\Rows\Rows.Divv.pas',
+  Rows.P in 'Source\Rows\Rows.P.pas',
+  Rows in 'Source\Rows\Rows.pas',
+  Rows.Tag in 'Source\Rows\Rows.Tag.pas',
+  Rows.Title.Config in 'Source\Rows\Rows.Title.Config.pas',
+  Rows.Title in 'Source\Rows\Rows.Title.pas',
+  Table.Action.Image in 'Source\Table\Table.Action.Image.pas',
+  Table.Action in 'Source\Table\Table.Action.pas',
+  Table.Callback in 'Source\Table\Table.Callback.pas',
+  Table.Data in 'Source\Table\Table.Data.pas',
+  Table.DataSet in 'Source\Table\Table.DataSet.pas',
+  Table.Features in 'Source\Table\Table.Features.pas',
+  Table.Options in 'Source\Table\Table.Options.pas',
+  Table in 'Source\Table\Table.pas',
+  Browser.VCL.WebBrowser in 'Source\Browser\Browser.VCL.WebBrowser.pas';
 
 end.
 
diff --git a/TBGWebCharts.dproj b/TBGWebCharts.dproj
index be03d6f..3c16fa9 100644
--- a/TBGWebCharts.dproj
+++ b/TBGWebCharts.dproj
@@ -54,6 +54,7 @@
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
         <DCC_BplOutput>.\$(Platform)\$(Config)</DCC_BplOutput>
+        <DCC_UnitSearchPath>.\Source\Include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -94,141 +95,141 @@
         <DCCReference Include="IndySystem.dcp"/>
         <DCCReference Include="IndyProtocols.dcp"/>
         <DCCReference Include="IndyCore.dcp"/>
-        <DCCReference Include="Charts.Config.pas"/>
-        <DCCReference Include="Charts.pas"/>
-        <DCCReference Include="HTML.pas"/>
-        <DCCReference Include="Rows.pas"/>
-        <DCCReference Include="Rows.Tag.pas"/>
-        <DCCReference Include="Rows.Title.Config.pas"/>
-        <DCCReference Include="Rows.Title.pas"/>
-        <DCCReference Include="View.Reg.pas"/>
-        <DCCReference Include="View.WebCharts.pas"/>
-        <DCCReference Include="Charts.DataSet.pas"/>
-        <DCCReference Include="Rows.Divv.pas"/>
-        <DCCReference Include="Table.DataSet.pas"/>
-        <DCCReference Include="Table.pas"/>
-        <DCCReference Include="Cards.pas"/>
-        <DCCReference Include="Color.pas"/>
-        <DCCReference Include="Cards.DataSet.pas"/>
-        <DCCReference Include="Injection.pas"/>
-        <DCCReference Include="Image.pas"/>
-        <DCCReference Include="Image.DataSet.pas"/>
-        <DCCReference Include="Image.Classes.pas"/>
-        <DCCReference Include="Rows.P.pas"/>
-        <DCCReference Include="PackCss.pas"/>
-        <DCCReference Include="PackJS.pas"/>
-        <DCCReference Include="Charts.Labelling.pas"/>
-        <DCCReference Include="Charts.Callback.pas"/>
-        <DCCReference Include="NumberJS.pas"/>
-        <DCCReference Include="Charts.Axes.Params.pas"/>
-        <DCCReference Include="Charts.Axes.pas"/>
-        <DCCReference Include="Charts.Axes.Ticks.pas"/>
-        <DCCReference Include="Charts.Axes.GridLines.pas"/>
-        <DCCReference Include="Charts.Axes.ScaleLabel.pas"/>
-        <DCCReference Include="Charts.Legends.pas"/>
-        <DCCReference Include="Charts.Legends.Labels.pas"/>
-        <DCCReference Include="Charts.Title.pas"/>
-        <DCCReference Include="Charts.Scales.pas"/>
-        <DCCReference Include="Charts.Options.pas"/>
-        <DCCReference Include="Charts.Generic.pas"/>
-        <DCCReference Include="Charts.Types.pas"/>
-        <DCCReference Include="Table.Options.pas"/>
-        <DCCReference Include="DataTableJS.pas"/>
-        <DCCReference Include="DataTableCss.pas"/>
-        <DCCReference Include="BootstrapCss.pas"/>
-        <DCCReference Include="Table.Data.pas"/>
-        <DCCReference Include="Table.Features.pas"/>
-        <DCCReference Include="Table.Callback.pas"/>
-        <DCCReference Include="Interfaces.pas"/>
-        <DCCReference Include="StyleCSS.pas"/>
-        <DCCReference Include="Charts.Easy.Pie.pas"/>
-        <DCCReference Include="Chart.Easy.PieJS.pas"/>
-        <DCCReference Include="Chart.Easy.PieCSS.pas"/>
-        <DCCReference Include="Button.pas"/>
-        <DCCReference Include="Buttons.Classes.pas"/>
-        <DCCReference Include="Factory.pas"/>
-        <DCCReference Include="Jumbotron.pas"/>
-        <DCCReference Include="Alerts.pas"/>
-        <DCCReference Include="Alerts.Classes.pas"/>
-        <DCCReference Include="CallBackJS.pas"/>
-        <DCCReference Include="ListGroup.pas"/>
-        <DCCReference Include="ListGroup.Classes.pas"/>
-        <DCCReference Include="Generic.DataSet.pas"/>
-        <DCCReference Include="PivotTable.pas"/>
-        <DCCReference Include="Generic.List.pas"/>
-        <DCCReference Include="PivotTable.Config.pas"/>
-        <DCCReference Include="Generic.Style.pas"/>
-        <DCCReference Include="JSCommand.pas"/>
-        <DCCReference Include="PivotTableJS.pas"/>
-        <DCCReference Include="JQuery.UIJS.pas"/>
-        <DCCReference Include="PivotTableCSS.pas"/>
-        <DCCReference Include="BootstrapJS.pas"/>
-        <DCCReference Include="PivotTablePlotlyJS.pas"/>
-        <DCCReference Include="PivotTablePlotlyRendersJS.pas"/>
-        <DCCReference Include="PivotTable.Classes.pas"/>
-        <DCCReference Include="Charts.Axes.Params.RealTime.pas"/>
-        <DCCReference Include="MomentJS.pas"/>
-        <DCCReference Include="ChartStreamJS.pas"/>
-        <DCCReference Include="Charts.Plugins.pas"/>
-        <DCCReference Include="UtilsJS.pas"/>
-        <DCCReference Include="FontawesomeallJS.pas"/>
-        <DCCReference Include="JqueryJS.pas"/>
-        <DCCReference Include="PopperJS.pas"/>
-        <DCCReference Include="TetherminJS.pas"/>
-        <DCCReference Include="ChartbundleJS.pas"/>
-        <DCCReference Include="Charts.Tooltip.pas"/>
-        <DCCReference Include="Table.Action.Image.pas"/>
-        <DCCReference Include="Utilities.Encoder.pas"/>
-        <DCCReference Include="Table.Action.pas"/>
-        <DCCReference Include="GMapsJS.pas"/>
-        <DCCReference Include="Maps.pas"/>
-        <DCCReference Include="Maps.GMaps.pas"/>
-        <DCCReference Include="Generic.Coordinates.pas"/>
-        <DCCReference Include="Maps.GMaps.Options.pas"/>
-        <DCCReference Include="Maps.Dataset.pas"/>
-        <DCCReference Include="Maps.GMaps.Draw.pas"/>
-        <DCCReference Include="Maps.GMaps.Draw.Marker.pas"/>
-        <DCCReference Include="Maps.GMaps.Draw.Circle.pas"/>
-        <DCCReference Include="Utilities.Str.pas"/>
-        <DCCReference Include="Maps.GMaps.Layer.pas"/>
-        <DCCReference Include="Maps.GMaps.Layer.HeatMap.pas"/>
-        <DCCReference Include="Credenciais.pas"/>
-        <DCCReference Include="Generic.Title.pas"/>
-        <DCCReference Include="Maps.Gmaps.Routes.pas"/>
-        <DCCReference Include="Maps.Gmaps.Routes.Directions.pas"/>
-        <DCCReference Include="Maps.Gmaps.Routes.Directions.Panel.pas"/>
-        <DCCReference Include="Maps.InfoWindow.pas"/>
-        <DCCReference Include="Browser.VCL.WebBrowser.pas"/>
-        <DCCReference Include="D3JS.pas"/>
-        <DCCReference Include="LiquidFillGaugeJS.pas"/>
-        <DCCReference Include="LiquidFillGauge.pas"/>
-        <DCCReference Include="LiquidFillGauge.Config.pas"/>
-        <DCCReference Include="LiquidFillGaugeCSS.pas"/>
-        <DCCReference Include="CardStyled.pas"/>
-        <DCCReference Include="CardStyled.IconRight.pas"/>
-        <DCCReference Include="CardStyled.Text.pas"/>
-        <DCCReference Include="CardStyled.Shape.pas"/>
-        <DCCReference Include="CardStyled.Shape.Classes.pas"/>
-        <DCCReference Include="DomElement.pas"/>
-        <DCCReference Include="CardStyled.IconLeft.pas"/>
-        <DCCReference Include="QuillEditorJS.pas"/>
-        <DCCReference Include="QuillEditorCSS.pas"/>
-        <DCCReference Include="RichTextEditor.pas"/>
-        <DCCReference Include="RichTextEditor.Config.pas"/>
-        <DCCReference Include="QuillDeltaConverter.pas"/>
-        <DCCReference Include="RichTextEditor.Config.PrintHeader.pas"/>
-        <DCCReference Include="RichTextEditor.Config.PrintHeader.Divv.pas"/>
-        <DCCReference Include="RichTextEditor.Config.PrintHeader.Image.pas"/>
-        <DCCReference Include="RichTextEditor.Config.PrintHeader.Title.pas"/>
-        <DCCReference Include="CardStyled.IconBackground.pas"/>
-        <DCCReference Include="Generic.ProgressBar.pas"/>
-        <DCCReference Include="Colors.Bootstrap.pas"/>
-        <DCCReference Include="Progress.pas"/>
-        <DCCReference Include="CardStyled.Callback.pas"/>
-        <DCCReference Include="Progress.Info.pas"/>
-        <DCCReference Include="Progress.Info.Text.pas"/>
-        <DCCReference Include="Progress.Info.Icon.pas"/>
-        <DCCReference Include="ChartJSScript.pas"/>
+        <DCCReference Include="Source\Alerts.Classes.pas"/>
+        <DCCReference Include="Source\Alerts.pas"/>
+        <DCCReference Include="Source\BootstrapCss.pas"/>
+        <DCCReference Include="Source\BootstrapJS.pas"/>
+        <DCCReference Include="Source\Button.pas"/>
+        <DCCReference Include="Source\Buttons.Classes.pas"/>
+        <DCCReference Include="Source\CallBackJS.pas"/>
+        <DCCReference Include="Source\Cards.DataSet.pas"/>
+        <DCCReference Include="Source\Cards.pas"/>
+        <DCCReference Include="Source\ChartbundleJS.pas"/>
+        <DCCReference Include="Source\ChartJSScript.pas"/>
+        <DCCReference Include="Source\ChartStreamJS.pas"/>
+        <DCCReference Include="Source\Color.pas"/>
+        <DCCReference Include="Source\Colors.Bootstrap.pas"/>
+        <DCCReference Include="Source\Credenciais.pas"/>
+        <DCCReference Include="Source\D3JS.pas"/>
+        <DCCReference Include="Source\DataTableCss.pas"/>
+        <DCCReference Include="Source\DataTableJS.pas"/>
+        <DCCReference Include="Source\DomElement.pas"/>
+        <DCCReference Include="Source\Factory.pas"/>
+        <DCCReference Include="Source\FontawesomeallJS.pas"/>
+        <DCCReference Include="Source\GMapsJS.pas"/>
+        <DCCReference Include="Source\HTML.pas"/>
+        <DCCReference Include="Source\Image.Classes.pas"/>
+        <DCCReference Include="Source\Image.DataSet.pas"/>
+        <DCCReference Include="Source\Image.pas"/>
+        <DCCReference Include="Source\Injection.pas"/>
+        <DCCReference Include="Source\Interfaces.pas"/>
+        <DCCReference Include="Source\JQuery.UIJS.pas"/>
+        <DCCReference Include="Source\JqueryJS.pas"/>
+        <DCCReference Include="Source\JSCommand.pas"/>
+        <DCCReference Include="Source\Jumbotron.pas"/>
+        <DCCReference Include="Source\LiquidFillGauge.Config.pas"/>
+        <DCCReference Include="Source\LiquidFillGauge.pas"/>
+        <DCCReference Include="Source\LiquidFillGaugeCSS.pas"/>
+        <DCCReference Include="Source\LiquidFillGaugeJS.pas"/>
+        <DCCReference Include="Source\ListGroup.Classes.pas"/>
+        <DCCReference Include="Source\ListGroup.pas"/>
+        <DCCReference Include="Source\MomentJS.pas"/>
+        <DCCReference Include="Source\NumberJS.pas"/>
+        <DCCReference Include="Source\PackCss.pas"/>
+        <DCCReference Include="Source\PackJS.pas"/>
+        <DCCReference Include="Source\PopperJS.pas"/>
+        <DCCReference Include="Source\Progress.Info.Icon.pas"/>
+        <DCCReference Include="Source\Progress.Info.pas"/>
+        <DCCReference Include="Source\Progress.Info.Text.pas"/>
+        <DCCReference Include="Source\Progress.pas"/>
+        <DCCReference Include="Source\QuillDeltaConverter.pas"/>
+        <DCCReference Include="Source\QuillEditorCSS.pas"/>
+        <DCCReference Include="Source\QuillEditorJS.pas"/>
+        <DCCReference Include="Source\StyleCSS.pas"/>
+        <DCCReference Include="Source\TetherminJS.pas"/>
+        <DCCReference Include="Source\Utilities.Encoder.pas"/>
+        <DCCReference Include="Source\Utilities.Str.pas"/>
+        <DCCReference Include="Source\UtilsJS.pas"/>
+        <DCCReference Include="Source\View.Reg.pas"/>
+        <DCCReference Include="Source\View.WebCharts.pas"/>
+        <DCCReference Include="Source\CardStyled\CardStyled.Callback.pas"/>
+        <DCCReference Include="Source\CardStyled\CardStyled.IconBackground.pas"/>
+        <DCCReference Include="Source\CardStyled\CardStyled.IconLeft.pas"/>
+        <DCCReference Include="Source\CardStyled\CardStyled.IconRight.pas"/>
+        <DCCReference Include="Source\CardStyled\CardStyled.pas"/>
+        <DCCReference Include="Source\CardStyled\CardStyled.Shape.Classes.pas"/>
+        <DCCReference Include="Source\CardStyled\CardStyled.Shape.pas"/>
+        <DCCReference Include="Source\CardStyled\CardStyled.Text.pas"/>
+        <DCCReference Include="Source\CardStyled\Chart.Easy.PieCSS.pas"/>
+        <DCCReference Include="Source\CardStyled\Chart.Easy.PieJS.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Axes.GridLines.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Axes.Params.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Axes.Params.RealTime.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Axes.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Axes.ScaleLabel.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Axes.Ticks.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Callback.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Config.pas"/>
+        <DCCReference Include="Source\Charts\Charts.DataSet.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Easy.Pie.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Generic.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Labelling.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Legends.Labels.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Legends.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Options.pas"/>
+        <DCCReference Include="Source\Charts\Charts.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Plugins.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Scales.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Title.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Tooltip.pas"/>
+        <DCCReference Include="Source\Charts\Charts.Types.pas"/>
+        <DCCReference Include="Source\Generic\Generic.Coordinates.pas"/>
+        <DCCReference Include="Source\Generic\Generic.DataSet.pas"/>
+        <DCCReference Include="Source\Generic\Generic.List.pas"/>
+        <DCCReference Include="Source\Generic\Generic.ProgressBar.pas"/>
+        <DCCReference Include="Source\Generic\Generic.Style.pas"/>
+        <DCCReference Include="Source\Generic\Generic.Title.pas"/>
+        <DCCReference Include="Source\Maps\Maps.Dataset.pas"/>
+        <DCCReference Include="Source\Maps\Maps.GMaps.Draw.Circle.pas"/>
+        <DCCReference Include="Source\Maps\Maps.GMaps.Draw.Marker.pas"/>
+        <DCCReference Include="Source\Maps\Maps.GMaps.Draw.pas"/>
+        <DCCReference Include="Source\Maps\Maps.GMaps.Layer.HeatMap.pas"/>
+        <DCCReference Include="Source\Maps\Maps.GMaps.Layer.pas"/>
+        <DCCReference Include="Source\Maps\Maps.GMaps.Options.pas"/>
+        <DCCReference Include="Source\Maps\Maps.GMaps.pas"/>
+        <DCCReference Include="Source\Maps\Maps.Gmaps.Routes.Directions.Panel.pas"/>
+        <DCCReference Include="Source\Maps\Maps.Gmaps.Routes.Directions.pas"/>
+        <DCCReference Include="Source\Maps\Maps.Gmaps.Routes.pas"/>
+        <DCCReference Include="Source\Maps\Maps.InfoWindow.pas"/>
+        <DCCReference Include="Source\Maps\Maps.pas"/>
+        <DCCReference Include="Source\PivotTable\PivotTable.Classes.pas"/>
+        <DCCReference Include="Source\PivotTable\PivotTable.Config.pas"/>
+        <DCCReference Include="Source\PivotTable\PivotTable.pas"/>
+        <DCCReference Include="Source\PivotTable\PivotTableCSS.pas"/>
+        <DCCReference Include="Source\PivotTable\PivotTableJS.pas"/>
+        <DCCReference Include="Source\PivotTable\PivotTablePlotlyJS.pas"/>
+        <DCCReference Include="Source\PivotTable\PivotTablePlotlyRendersJS.pas"/>
+        <DCCReference Include="Source\RichTextEditor\RichTextEditor.Config.pas"/>
+        <DCCReference Include="Source\RichTextEditor\RichTextEditor.Config.PrintHeader.Divv.pas"/>
+        <DCCReference Include="Source\RichTextEditor\RichTextEditor.Config.PrintHeader.Image.pas"/>
+        <DCCReference Include="Source\RichTextEditor\RichTextEditor.Config.PrintHeader.pas"/>
+        <DCCReference Include="Source\RichTextEditor\RichTextEditor.Config.PrintHeader.Title.pas"/>
+        <DCCReference Include="Source\RichTextEditor\RichTextEditor.pas"/>
+        <DCCReference Include="Source\Rows\Rows.Divv.pas"/>
+        <DCCReference Include="Source\Rows\Rows.P.pas"/>
+        <DCCReference Include="Source\Rows\Rows.pas"/>
+        <DCCReference Include="Source\Rows\Rows.Tag.pas"/>
+        <DCCReference Include="Source\Rows\Rows.Title.Config.pas"/>
+        <DCCReference Include="Source\Rows\Rows.Title.pas"/>
+        <DCCReference Include="Source\Table\Table.Action.Image.pas"/>
+        <DCCReference Include="Source\Table\Table.Action.pas"/>
+        <DCCReference Include="Source\Table\Table.Callback.pas"/>
+        <DCCReference Include="Source\Table\Table.Data.pas"/>
+        <DCCReference Include="Source\Table\Table.DataSet.pas"/>
+        <DCCReference Include="Source\Table\Table.Features.pas"/>
+        <DCCReference Include="Source\Table\Table.Options.pas"/>
+        <DCCReference Include="Source\Table\Table.pas"/>
+        <DCCReference Include="Source\Browser\Browser.VCL.WebBrowser.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -260,6 +261,12 @@
             </Platforms>
             <Deployment Version="4">
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\TBGWebCharts.bpl" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName="Win32\Debug\TBGWebCharts.bpl" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>TBGWebCharts.bpl</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">
                         <Operation>1</Operation>
diff --git a/TBGWebCharts.dproj.local b/TBGWebCharts.dproj.local
deleted file mode 100644
index 282baf2..0000000
--- a/TBGWebCharts.dproj.local
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<BorlandProject>
-	<Transactions>
-    <Transaction>2020/06/22 10:28:44.000.159,C:\Componentes\TBGWebCharts\trunk\Unit5.pas=C:\Componentes\TBGWebCharts\trunk\Charts.UpdateRealTime.pas</Transaction>
-  </Transactions>
-	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="Alerts.Classes.pas"/>
-    <File Path="Alerts.pas"/>
-    <File Path="BootstrapCss.pas"/>
-    <File Path="BootstrapJS.pas"/>
-    <File Path="Button.pas"/>
-    <File Path="Buttons.Classes.pas"/>
-    <File Path="CallBackJS.pas"/>
-    <File Path="Cards.DataSet.pas"/>
-    <File Path="Cards.pas"/>
-    <File Path="Chart.Easy.PieCSS.pas"/>
-    <File Path="Chart.Easy.PieJS.pas"/>
-    <File Path="Charts.Axes.GridLines.pas"/>
-    <File Path="Charts.Axes.Params.pas"/>
-    <File Path="Charts.Axes.Params.RealTime.pas"/>
-    <File Path="Charts.Axes.pas"/>
-    <File Path="Charts.Axes.ScaleLabel.pas"/>
-    <File Path="Charts.Axes.Ticks.pas"/>
-    <File Path="Charts.Callback.pas"/>
-    <File Path="Charts.Config.pas"/>
-    <File Path="Charts.DataSet.pas"/>
-    <File Path="Charts.Easy.Pie.pas"/>
-    <File Path="Charts.Generic.pas"/>
-    <File Path="Charts.Labelling.pas"/>
-    <File Path="Charts.Legends.Labels.pas"/>
-    <File Path="Charts.Legends.pas"/>
-    <File Path="Charts.Options.pas"/>
-    <File Path="Charts.pas"/>
-    <File Path="Charts.Plugins.pas"/>
-    <File Path="Charts.Scales.pas"/>
-    <File Path="Charts.Title.pas"/>
-    <File Path="Charts.Types.pas"/>
-    <File Path="ChartStreamJS.pas"/>
-    <File Path="Color.pas"/>
-    <File Path="DataTableCss.pas"/>
-    <File Path="DataTableJS.pas"/>
-    <File Path="Factory.pas"/>
-    <File Path="Generic.DataSet.pas"/>
-    <File Path="Generic.List.pas"/>
-    <File Path="Generic.Style.pas"/>
-    <File Path="HTML.pas"/>
-    <File Path="Image.Classes.pas"/>
-    <File Path="Image.DataSet.pas"/>
-    <File Path="Image.pas"/>
-    <File Path="Injection.pas"/>
-    <File Path="Interfaces.pas"/>
-    <File Path="JQuery.UIJS.pas"/>
-    <File Path="JSCommand.pas"/>
-    <File Path="Jumbotron.pas"/>
-    <File Path="ListGroup.Classes.pas"/>
-    <File Path="ListGroup.pas"/>
-    <File Path="MomentJS.pas"/>
-    <File Path="NumberJS.pas"/>
-    <File Path="PackCss.pas"/>
-    <File Path="PackJS.pas"/>
-    <File Path="PivotTable.Classes.pas"/>
-    <File Path="PivotTable.Config.pas"/>
-    <File Path="PivotTable.pas"/>
-    <File Path="PivotTableCSS.pas"/>
-    <File Path="PivotTableJS.pas"/>
-    <File Path="PivotTablePlotlyJS.pas"/>
-    <File Path="PivotTablePlotlyRendersJS.pas"/>
-    <File Path="Rows.Divv.pas"/>
-    <File Path="Rows.P.pas"/>
-    <File Path="Rows.pas"/>
-    <File Path="Rows.Tag.pas"/>
-    <File Path="Rows.Title.Config.pas"/>
-    <File Path="Rows.Title.pas"/>
-    <File Path="StyleCSS.pas"/>
-    <File Path="Table.Callback.pas"/>
-    <File Path="Table.Data.pas"/>
-    <File Path="Table.DataSet.pas"/>
-    <File Path="Table.Features.pas"/>
-    <File Path="Table.Options.pas"/>
-    <File Path="Table.pas"/>
-    <File Path="View.Reg.pas"/>
-    <File Path="View.WebCharts.pas"/>
-    <File Path="UtilsJS.pas"/>
-    <File Path="FontawesomeallJS.pas"/>
-    <File Path="JqueryJS.pas"/>
-    <File Path="PopperJS.pas"/>
-    <File Path="TetherminJS.pas"/>
-    <File Path="ChartbundleJS.pas"/>
-    <File Path="Charts.Tooltip.pas"/>
-    <File Path="dbrtl.dcp"/>
-    <File Path="fmx.dcp"/>
-    <File Path="IndyCore.dcp"/>
-    <File Path="IndyProtocols.dcp"/>
-    <File Path="IndySystem.dcp"/>
-    <File Path="rtl.dcp"/>
-    <File Path="vcl.dcp"/>
-    <File Path="vclie.dcp"/>
-  </ProjectSortOrder>
-</BorlandProject>
diff --git a/TBGWebCharts.dres b/TBGWebCharts.dres
deleted file mode 100644
index d12edb1..0000000
Binary files a/TBGWebCharts.dres and /dev/null differ
diff --git a/TBGWebCharts.otares b/TBGWebCharts.otares
deleted file mode 100644
index 7435995..0000000
Binary files a/TBGWebCharts.otares and /dev/null differ
diff --git a/TBGWebCharts.res b/TBGWebCharts.res
deleted file mode 100644
index 529a7b5..0000000
Binary files a/TBGWebCharts.res and /dev/null differ
diff --git a/TBGWebCharts.stat b/TBGWebCharts.stat
deleted file mode 100644
index 1bf9099..0000000
--- a/TBGWebCharts.stat
+++ /dev/null
@@ -1,10 +0,0 @@
-[Stats]
-EditorSecs=1
-DesignerSecs=1
-InspectorSecs=1
-CompileSecs=56708
-OtherSecs=251
-StartTime=25/08/2020 19:56:54
-RealKeys=0
-EffectiveKeys=0
-DebugSecs=1
diff --git a/boss.json b/boss.json
index 8aadd42..80d22ed 100644
--- a/boss.json
+++ b/boss.json
@@ -3,7 +3,7 @@
 	"description": "",
 	"version": "1.0.0",
 	"homepage": "",
-	"mainsrc": "./",
+	"mainsrc": "./Source",
 	"projects": [],
 	"dependencies": {}
 }
\ No newline at end of file