diff --git a/modem/freedata.spec b/modem/freedata.spec
index 6ae5fdc1..2749d976 100644
--- a/modem/freedata.spec
+++ b/modem/freedata.spec
@@ -4,7 +4,7 @@
 block_cipher = None
 
 # DAEMON --------------------------------------------------
-daemon_a = Analysis(['daemon.py'],
+server_a = Analysis(['server.py'],
              pathex=[],
              binaries=[],
              datas=[],
@@ -17,15 +17,15 @@ daemon_a = Analysis(['daemon.py'],
              win_private_assemblies=False,
              cipher=block_cipher,
              noarchive=False)
-daemon_pyz = PYZ(daemon_a.pure, daemon_a.zipped_data,
+server_pyz = PYZ(server_a.pure, server_a.zipped_data,
              cipher=block_cipher)
 
-daemon_exe = EXE(daemon_pyz,
-          daemon_a.scripts, 
+server_exe = EXE(server_pyz,
+          server_a.scripts,
           [],
           exclude_binaries=True,
-          name='freedata-daemon',
-          bundle_identifier='com.dj2ls.freedata-daemon',
+          name='freedata-server',
+          bundle_identifier='app.freedata.freedata-server',
           debug=False,
           bootloader_ignore_signals=False,
           strip=False,
@@ -37,52 +37,15 @@ daemon_exe = EXE(daemon_pyz,
           entitlements_file=None )
           
 # add lib folder to system path. We only need to do this once
-daemon_a.datas += Tree('lib', prefix='lib')
+server_a.datas += Tree('lib', prefix='lib')
 # daemon_a.datas += Tree('./codec2', prefix='codec2')
 
 
-# Modem --------------------------------------------------
-modem_a = Analysis(['main.py'],
-             pathex=[],
-             binaries=[],
-             datas=[],
-             hiddenimports=[],
-             hookspath=[],
-             hooksconfig={},
-             runtime_hooks=[],
-             excludes=[],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher,
-             noarchive=False)
-modem_pyz = PYZ(modem_a.pure, modem_a.zipped_data,
-             cipher=block_cipher)
 
-modem_exe = EXE(modem_pyz,
-          modem_a.scripts, 
-          [],
-          exclude_binaries=True,
-          name='freedata-modem',
-          bundle_identifier='com.dj2ls.freedata-modem',
-          debug=False,
-          bootloader_ignore_signals=False,
-          strip=False,
-          upx=True,
-          console=True,
-          disable_windowed_traceback=False,
-          target_arch=None,
-          codesign_identity=None,
-          entitlements_file=None )
-
-
-coll = COLLECT(daemon_exe,
-               daemon_a.binaries,
-               daemon_a.zipfiles,
-               daemon_a.datas,
-               modem_exe,
-               modem_a.binaries,
-               modem_a.zipfiles,
-               modem_a.datas, 
+coll = COLLECT(server_exe,
+               server_a.binaries,
+               server_a.zipfiles,
+               server_a.datas,
                strip=False,
                upx=True,
                upx_exclude=[],