diff --git a/.gitignore b/.gitignore
index d5749da..d4a3042 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,4 +106,4 @@ wdspWisdom00
 ewsdr
 hpsdr_trx
 webserver_debug.log
-
+bin/
diff --git a/ewsdr.ico b/ewsdr.ico
new file mode 100644
index 0000000..f663325
Binary files /dev/null and b/ewsdr.ico differ
diff --git a/ewsdr.lpi b/ewsdr.lpi
index b950b1f..9d69e34 100644
--- a/ewsdr.lpi
+++ b/ewsdr.lpi
@@ -7,6 +7,7 @@
       <Title Value="EWSDR"/>
       <Scaled Value="True"/>
       <ResourceType Value="res"/>
+      <Icon Value="0"/>
     </General>
     <VersionInfo>
       <UseVersionInfo Value="True"/>
@@ -17,8 +18,12 @@
       <Item Name="Release">
         <CompilerOptions>
           <Version Value="11"/>
+          <Target>
+            <Filename Value="bin/$(TargetCPU)-$(TargetOS)/ewsdr"/>
+          </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
+            <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
             <SyntaxOptions>
@@ -74,12 +79,68 @@
         <Filename Value="HPSDRNetwork.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit>
+      <Unit>
+        <Filename Value="WebServer.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="WebPageHtml.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="WDSPEngine.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="VfoOverlay.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="AudioOutput.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="DeviceForm.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="FlatButton.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="FreqDisplay.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="WDSP.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="WebUtils.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="WinFirewall.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="WsClient.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Settings.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
+    <Target>
+      <Filename Value="bin/$(TargetCPU)-$(TargetOS)/ewsdr-debug"/>
+    </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
+      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/ewsdr.lpr b/ewsdr.lpr
index cbebb4d..c41a720 100644
--- a/ewsdr.lpr
+++ b/ewsdr.lpr
@@ -14,8 +14,9 @@ uses
   cthreads,
   {$ENDIF}
   Interfaces,  // LCL platform
-  Forms,
-  MainForm;
+  Forms, MainForm, AudioOutput, DeviceForm, FlatButton, FreqDisplay, VfoOverlay,
+  WDSP, WDSPEngine, WebPageHtml, WebServer, WebUtils, WinFirewall, WsClient,
+  Settings;
 
 {$R *.res}
 
diff --git a/hpsdr_devices.ini b/hpsdr_devices.ini
deleted file mode 100644
index ec2535f..0000000
--- a/hpsdr_devices.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[Devices]
-Count=2
-
-[Device0]
-Name=172.16.2.200  ORION MkII (ANAN-7000/8000)  FW:22  DDC:8
-IP=172.16.2.200
-BoardType=5
-AutoStart=1
-
-[Device1]
-Name=172.16.2.99  ORION MkII (ANAN-7000/8000)  FW:19  DDC:2
-IP=172.16.2.99
-BoardType=5
-AutoStart=0
diff --git a/hpsdr_settings.json b/hpsdr_settings.json
deleted file mode 100644
index a21aedb..0000000
--- a/hpsdr_settings.json
+++ /dev/null
@@ -1,389 +0,0 @@
-{
-  " 0:1C:C0:A2:17:EE" : {
-    "global" : {
-      "volume" : 70,
-      "drive_level" : 50,
-      "active_vfo" : 0,
-      "nr_enabled" : false,
-      "nb_enabled" : false,
-      "anf_enabled" : false,
-      "agc_slope" : 0,
-      "agc_hang_threshold" : 100,
-      "last_band" : 3,
-      "window_left" : 80,
-      "window_top" : 80,
-      "window_width" : 1400,
-      "window_height" : 900
-    },
-    "bands" : {
-      "0" : {
-        "vfo_a" : 1.9000000000000000E+006,
-        "vfo_b" : 1.9000000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "1" : {
-        "vfo_a" : 3.7500000000000000E+006,
-        "vfo_b" : 3.7500000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 49,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "2" : {
-        "vfo_a" : 5.3570000000000000E+006,
-        "vfo_b" : 5.3570000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "3" : {
-        "vfo_a" : 7.1032350000000000E+006,
-        "vfo_b" : 7.1000000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "4" : {},
-      "5" : {
-        "vfo_a" : 1.4200000000000000E+007,
-        "vfo_b" : 1.4200000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "6" : {},
-      "7" : {
-        "vfo_a" : 2.1200000000000000E+007,
-        "vfo_b" : 2.1200000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "8" : {
-        "vfo_a" : 2.4940000000000000E+007,
-        "vfo_b" : 2.4940000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "9" : {
-        "vfo_a" : 2.8500000000000000E+007,
-        "vfo_b" : 2.8500000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "10" : {}
-    }
-  },
-  " 4:91:62:FD:7B:86" : {
-    "global" : {
-      "window_left" : 80,
-      "window_top" : 80,
-      "window_width" : 1400,
-      "window_height" : 900,
-      "volume" : 70,
-      "drive_level" : 50,
-      "active_vfo" : 0,
-      "nr_enabled" : false,
-      "nb_enabled" : false,
-      "anf_enabled" : false,
-      "agc_slope" : 0,
-      "agc_hang_threshold" : 100,
-      "wf_agc_enabled" : true,
-      "wf_nf_enabled" : true,
-      "last_band" : 1
-    },
-    "bands" : {
-      "0" : {
-        "vfo_a" : 1.9000000000000000E+006,
-        "vfo_b" : 1.9000000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "1" : {
-        "vfo_a" : 3.6740000000000000E+006,
-        "vfo_b" : 3.7500000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 50,
-        "ctun" : true,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "2" : {
-        "vfo_a" : 5.3570000000000000E+006,
-        "vfo_b" : 5.3570000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "3" : {
-        "vfo_a" : 7.1020000000000000E+006,
-        "vfo_b" : 7.1000000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 2,
-        "agc_top" : 55,
-        "ctun" : true,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "4" : {
-        "vfo_a" : 1.0125000000000000E+007,
-        "vfo_b" : 1.0125000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 87,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "5" : {
-        "vfo_a" : 1.4149000000000000E+007,
-        "vfo_b" : 1.4200000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 62,
-        "ctun" : true,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "6" : {
-        "vfo_a" : 1.8120000000000000E+007,
-        "vfo_b" : 1.8120000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "7" : {
-        "vfo_a" : 2.1200000000000000E+007,
-        "vfo_b" : 2.1200000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "8" : {
-        "vfo_a" : 2.4940000000000000E+007,
-        "vfo_b" : 2.4940000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "9" : {
-        "vfo_a" : 2.8500000000000000E+007,
-        "vfo_b" : 2.8500000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "10" : {
-        "vfo_a" : 5.0150000000000000E+007,
-        "vfo_b" : 5.0150000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      }
-    }
-  },
-  "window" : {
-    "left" : 522,
-    "top" : 139,
-    "width" : 1516,
-    "height" : 802
-  },
-  " 0: 0: 0: 0: 0: 0" : {
-    "global" : {
-      "volume" : 76,
-      "drive_level" : 50,
-      "active_vfo" : 0,
-      "nr_enabled" : false,
-      "nb_enabled" : false,
-      "anf_enabled" : false,
-      "agc_slope" : 0,
-      "agc_hang_threshold" : 100,
-      "wf_agc_enabled" : true,
-      "wf_nf_enabled" : true,
-      "last_band" : 1,
-      "sample_rate" : 192000
-    },
-    "bands" : {
-      "0" : {
-        "vfo_a" : 1.9000000000000000E+006,
-        "vfo_b" : 1.9000000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "1" : {
-        "vfo_a" : 3.6630000000000000E+006,
-        "vfo_b" : 3.7500000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 60,
-        "ctun" : true,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "2" : {
-        "vfo_a" : 5.3570000000000000E+006,
-        "vfo_b" : 5.3570000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "3" : {
-        "vfo_a" : 7.1250000000000000E+006,
-        "vfo_b" : 7.1000000000000000E+006,
-        "mode" : 0,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 61,
-        "ctun" : true,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "4" : {
-        "vfo_a" : 1.0125000000000000E+007,
-        "vfo_b" : 1.0125000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "5" : {
-        "vfo_a" : 1.4189000000000000E+007,
-        "vfo_b" : 1.4200000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 69,
-        "ctun" : true,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "6" : {
-        "vfo_a" : 1.8120000000000000E+007,
-        "vfo_b" : 1.8120000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "7" : {
-        "vfo_a" : 2.1200000000000000E+007,
-        "vfo_b" : 2.1200000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "8" : {
-        "vfo_a" : 2.4940000000000000E+007,
-        "vfo_b" : 2.4940000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "9" : {
-        "vfo_a" : 2.8500000000000000E+007,
-        "vfo_b" : 2.8500000000000000E+007,
-        "mode" : 1,
-        "filter_idx" : 5,
-        "filter_bw" : 2700,
-        "agc_mode" : 1,
-        "agc_top" : 90,
-        "ctun" : false,
-        "span_hz" : 1.9200000000000000E+005
-      },
-      "10" : {}
-    }
-  }
-}
\ No newline at end of file
diff --git a/icon/icon.png b/icon/icon.png
new file mode 100644
index 0000000..46991bd
Binary files /dev/null and b/icon/icon.png differ
diff --git a/icon/icon128.png b/icon/icon128.png
new file mode 100644
index 0000000..b827204
Binary files /dev/null and b/icon/icon128.png differ
diff --git a/icon/icon16.png b/icon/icon16.png
new file mode 100644
index 0000000..aedc6dc
Binary files /dev/null and b/icon/icon16.png differ
diff --git a/icon/icon256.png b/icon/icon256.png
new file mode 100644
index 0000000..2b1e704
Binary files /dev/null and b/icon/icon256.png differ
diff --git a/icon/icon32.png b/icon/icon32.png
new file mode 100644
index 0000000..ba2918c
Binary files /dev/null and b/icon/icon32.png differ
diff --git a/icon/icon48.png b/icon/icon48.png
new file mode 100644
index 0000000..291efa0
Binary files /dev/null and b/icon/icon48.png differ
diff --git a/icon/icon64.png b/icon/icon64.png
new file mode 100644
index 0000000..d38bf3e
Binary files /dev/null and b/icon/icon64.png differ
diff --git a/project1.ico b/project1.ico
deleted file mode 100644
index 86b1038..0000000
Binary files a/project1.ico and /dev/null differ