diff --git a/setup_win32.py b/setup_win32.py
index 1fc0f0d58..0e9b4982e 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -9,6 +9,10 @@ import sys
 from cx_Freeze import setup, Executable
 import requests.certs
 
+from lbrynet import __version__
+
+base_dir = os.path.abspath(os.path.dirname(__file__))
+
 def find_data_file(filename):
     if getattr(sys, 'frozen', False):
         # The application is frozen
@@ -19,16 +23,28 @@ def find_data_file(filename):
         data_dir = os.path.dirname(__file__)
     return os.path.join(data_dir, filename)
 
+console_scripts = ['lbrynet-stdin-uploader = lbrynet.lbrynet_console.LBRYStdinUploader:launch_stdin_uploader',
+                  'lbrynet-stdout-downloader = lbrynet.lbrynet_console.LBRYStdoutDownloader:launch_stdout_downloader',
+                  'lbrynet-create-network = lbrynet.create_network:main',
+                  'lbrynet-launch-node = lbrynet.dht.node:main',
+                  'lbrynet-launch-rpc-node = lbrynet.rpc_node:main',
+                  'lbrynet-rpc-node-cli = lbrynet.node_rpc_cli:main',
+                  'lbrynet-lookup-hosts-for-hash = lbrynet.dht_scripts:get_hosts_for_hash_in_dht',
+                  'lbrynet-announce_hash_to_dht = lbrynet.dht_scripts:announce_hash_to_dht',
+                  'lbrynet-daemon = lbrynet.lbrynet_daemon.LBRYDaemonControl:start',
+                  'stop-lbrynet-daemon = lbrynet.lbrynet_daemon.LBRYDaemonControl:stop',
+                  'lbrynet-cli = lbrynet.lbrynet_daemon.LBRYDaemonCLI:main']
+
 shortcut_table = [
     ('DesktopShortcut',  # Shortcut
      'DesktopFolder',  # Directory
-     'LBRY',  # Name
+     'lbrynet',  # Name
      'TARGETDIR',  # Component
-     '[TARGETDIR]\LBRY.exe',  # Target
+     '[TARGETDIR]\lbrynet.exe',  # Target
      None,  # Arguments
      None,  # Description
      None,  # Hotkey
-     os.path.join('lbrynet', 'lbrynet_gui', 'lbry-dark-icon.ico'),  # Icon
+     os.path.join('lbry-dark-icon.ico'),  # Icon
      None,  # IconIndex
      None,  # ShowCmd
      'TARGETDIR',  # WkDir
@@ -39,52 +55,56 @@ shortcut_table = [
 msi_data = {'Shortcut': shortcut_table}
 
 bdist_msi_options = {
-    'upgrade_code': '{66620F3A-DC3A-11E2-B341-002219E9B01F}',
+    # 'upgrade_code': '{66620F3A-DC3A-11E2-B341-002219E9B01F}',
     'add_to_path': False,
-    'initial_target_dir': r'[LocalAppDataFolder]\LBRY',
+    'initial_target_dir': r'[LocalAppDataFolder]\lbrynet',
     'data': msi_data,
     }
 
 build_exe_options = {
     'include_msvcr': True,
     'includes': [],
-    'packages': ['six', 'os', 'twisted', 'miniupnpc', 'unqlite', 'seccure',
-                 'requests', 'bitcoinrpc', 'txjsonrpc', 'win32api', 'Crypto',
-                 'gmpy', 'yapsy', 'lbryum', 'google.protobuf'],
-    'excludes': ['zope.interface._zope_interface_coptimizations'],
-    'include_files': [os.path.join('lbrynet', 'lbrynet_gui', 'close.gif'),
-                      os.path.join('lbrynet', 'lbrynet_gui', 'close1.png'),
-                      os.path.join('lbrynet', 'lbrynet_gui', 'close2.gif'),
-                      os.path.join('lbrynet', 'lbrynet_gui', 'drop_down.gif'),
-                      os.path.join('lbrynet', 'lbrynet_gui', 'hide_options.gif'),
-                      os.path.join('lbrynet', 'lbrynet_gui', 'lbry-dark-242x80.gif'),
-                      os.path.join('lbrynet', 'lbrynet_gui', 'lbry-dark-icon.ico'),
-                      os.path.join('lbrynet', 'lbrynet_gui', 'lbry-dark-icon.xbm'),
-                      os.path.join('lbrynet', 'lbrynet_gui', 'show_options.gif'),
-                      os.path.join('lbrycrdd.exe'),  # Not included in repo
-                      os.path.join('lbrycrd-cli.exe'),  # Not included in repo
-                      (requests.certs.where(), 'cacert.pem'),
-                      ],
+    'packages': ['Crypto', 'twisted', 'miniupnpc', 'yapsy', 'seccure',
+                 'bitcoinrpc', 'txjsonrpc', 'requests', 'unqlite', 'lbryum',
+                 'jsonrpc', 'simplejson', 'appdirs', 'six', 'base58', 'googlefinance',
+                 'ecdsa', 'pbkdf2', 'qrcode', 'jsonrpclib',
+                 'os', 'cython', 'win32api', 'pkg_resources', 'zope.interface',
+                 'argparse', 'colorama', 'certifi'
+                 # 'gmpy', 'wsgiref', 'slowaes', 'dnspython', 'protobuf', 'google', 'google.protobuf'
+                 ],
+    'excludes': ['collections.sys', 'collections._weakref', 'tkinter', 'tk', 'tcl'
+                 'zope.interface._zope_interface_coptimizations', 'matplotlib', 'numpy', 'pillow', 'pandas'],
+    'include_files': [(requests.certs.where(), 'cacert.pem')],
     'namespace_packages': ['zope']}
 
 exe = Executable(
-    script=os.path.join('lbrynet', 'lbrynet_gui', 'gui.py'),
-    base='Win32GUI',
-    icon=os.path.join('lbrynet', 'lbrynet_gui', 'lbry-dark-icon.ico'),
+    script=os.path.join('lbrynet', 'lbrynet_daemon', 'LBRYDaemonControl.py'),
+    # base='Win32GUI',
+    icon=os.path.join('packaging', 'windows', 'icons', 'lbry256.ico'),
+    # icon=os.path.join('lbry-dark-icon.ico'),
     compress=True,
-    shortcutName='LBRY',
+    shortcutName='lbrynet',
     shortcutDir='DesktopFolder',
-    targetName='LBRY.exe'
+    targetName='lbrynet.exe'
     # targetDir="LocalAppDataFolder"
     )
 
 setup(
-    name='LBRY',
-    version='0.0.4',
-    description='A fully decentralized network for distributing data',
+    name='lbrynet',
+    version=__version__,
+    description='A decentralized media library and marketplace',
     url='lbry.io',
     author='',
     keywords='LBRY',
+    # entry_points={'console_scripts': console_scripts},
+    data_files=[
+      ('lbrynet/lbrynet_console/plugins',
+       [
+           os.path.join(base_dir, 'lbrynet', 'lbrynet_console', 'plugins',
+                        'blindrepeater.yapsy-plugin')
+       ]
+       ),
+    ],
     options={'build_exe': build_exe_options,
              'bdist_msi': bdist_msi_options},
     executables=[exe],