diff --git a/syslab-python/.gitignore b/syslab-python/.gitignore
deleted file mode 100644
index 1edbec7..0000000
--- a/syslab-python/.gitignore
+++ /dev/null
@@ -1,109 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-
-\.DS_Store
-
-# Pycharm
-.idea/
\ No newline at end of file
diff --git a/syslab-python/README.md b/syslab-python/README.md
deleted file mode 100644
index 371e682..0000000
--- a/syslab-python/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# SYSLAB Python Interface
-
-This project provides a Python interface to several SYSLAB components.
-
-## Required software
-
-- Python (>=3.7)
-- python-requests (>=2.18)
-- python-bs4 (>= 4.7)
-
-## Installation
-
-To install the package in your local path, run
-
-```shell
-    python setup.py install
-```
-
-Alternatively, copy the `syslab` folder into your project directory.
-
-# Contributors
-
-- Anders Thavlov: Initial implementation
-- Oliver Gehrke
-- Daniel Esteban Morales Bondy
-- Tue Vissing Jensen
-- Federico Zarelli
diff --git a/syslab-python/example.py b/syslab-python/example.py
deleted file mode 100644
index ea97246..0000000
--- a/syslab-python/example.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from syslab import SwitchBoard
-
-name = '319-2'
-SB_connection = SwitchBoard(name)
-print("Let's look at what is going on in the switchboard {}.".format(name))
-
-for bay in range(SB_connection.getNumBays()):
-	print(SB_connection.getBayName(bay),' : ',SB_connection.getActivePower(bay))
-
-
-
diff --git a/syslab-python/notes.md b/syslab-python/notes.md
deleted file mode 100644
index 7065476..0000000
--- a/syslab-python/notes.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# Notes on SOAP implementation
-
-    - Units should reflect SOAP methods onto their own namespace (1)
-    - CompositeMeasurement should convert to/from SOAP
-    - Type checking via client.get\_type('ns0:compositeMeasurement').elements
-    - 
-
-# Notes about this module - to be discussed
-
-SYSLAB\_Unit.py has a whole bunch of static methods - should these be split into a util library instead?
-Generally, many places where static methods are used for things that should perhaps just be functions...
-
-The following files are empty:
-    - BattOpMode.py
-    - FlowBatteryState.py
-    - GaiaWindTurbine.py
-
-
-To check the methods available, use, e.g.:
-http://syslab-33.syslab.dk:8080/typebased_WebService_HeatSubstation/HeatSwitchboardWebService/716-h1/resourceNames
-
-To figure out this URL, look at software.xml for the corresponding machine, and use this template:
-
-http://(machineName).syslab.dk:(port)/(interfaceName)/(shortServerName)/(unitname)/resourceNames
-
-| field | corresponds to | notes |
-| ----- | -------------- | ----- |
-| machineName | N/A | Look this up on the wiki |
-| port | N/A | Dynamically allocated, starting at 8080 - good luck! |
-| interfaceName | typeBasedWebService, interfaceName | |
-| shortServerName | typeBasedWebService, serverClass | Remove the "Server" at the end |
-| unitname | dataLogger, unit | Also defined as "name" in hardware.xml |
-
-
--------------------------
-
-
-SYSLAB COMMON
-Broadcast event logger:
-
-Transcode to python:
-https://git.elektro.dtu.dk/syslab/syslab-common/-/blob/master/src/main/java/risoe/syslab/comm/broadcast/BroadcastLogSender.java
-
-broadcast log sender 
-:: transcode the "send()" method to python. It byte-encodes the message for UDP. 
-Java: 
-send(String origin, byte[] origIP, long timestamp, int ploadType, String message,
-                    int level, int flags, String[] tags)
-------------
-Python:
-----------.
-def send(origin, origIP, timestamp, ploadType, message, level, flags, tags):
-    ploadbytes = message[:min(1024, len(message))].encode()
-    origbytes = origin[:min(32, len(origin))].encode()
-    tagbytes = tagsToBytes(tags, 256)
-    pktlen = 2 + 2 + 1 + len(origbytes) + 4 + 2 + 2 + 8 + 1 + 2 + len(ploadbytes) + len(tagbytes)
-    buf = bytearray(pktlen)
-    buf[0] = BroadcastLogConstants.BROADCASTLOG_PKTID >> 8
-    buf[1] = BroadcastLogConstants.BROADCASTLOG_PKTID & 0xff
-    buf[2] = (pktlen >> 8) & 0xff
-    buf[3] = pktlen & 0xff
-    buf[4] = len(origbytes)
-    buf[5:5+len(origbytes)] = origbytes
-    writePtr = 5 + len(origbytes)
-    buf[writePtr:writePtr+4] = origIP
-    writePtr += 4
-    buf[writePtr] = (level >> 8) & 0xff
-    buf[writePtr+1] = level & 0xff
-    buf[writePtr+2] = (flags >> 8) & 0xff
-    buf[writePtr+3] = flags & 0xff
-    for i in range(8):
-        buf[writePtr+7-i] = timestamp & 0xff
-        timestamp >>= 8
-    writePtr += 8
-    buf[writePtr] = ploadType & 0xff
-    buf[writePtr+1] = (len(ploadbytes) >> 8) & 0xff
-    buf[writePtr+2] = len(ploadbytes) & 0xff
-    buf[writePtr+3:writePtr+3+len(ploadbytes)] = ploadbytes
-    writePtr += len(ploadbytes)
-    buf[writePtr:writePtr+len(tagbytes)] = tagbytes
-    pack = n
-    pack = DatagramPacket(buf, len(buf), InetAddress.getByName("localhost"), 4445)
-    sock.send(pack)
-
-
-------------
-
-broadcast log receiver
-+ needs a logger
-listener ist interface for receiver
-
-gui wall (SYSLAB Userspacce)
-broadcast log displet
-https://git.elektro.dtu.dk/syslab/syslab-userspace/-/blob/master/src/main/java/risoe/syslab/gui/wall/displets/BroadcastLogDisplet.java
-... maybe extend with simple log file writer. 
-
-
-
-
diff --git a/syslab-python/requirements.txt b/syslab-python/requirements.txt
deleted file mode 100644
index 25cc339..0000000
--- a/syslab-python/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-requests >= 2.18
-beautifulsoup4 >= 3.7
\ No newline at end of file
diff --git a/syslab-python/setup.cfg b/syslab-python/setup.cfg
deleted file mode 100644
index 43f9acc..0000000
--- a/syslab-python/setup.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-[flake8]
-ignore =
-max-line-length = 79
-max-complexity = 11
-
-[pytest]
-addopts = --doctest-glob="*.rst"
-
-[wheel]
-universal = True
diff --git a/syslab-python/setup.py b/syslab-python/setup.py
deleted file mode 100644
index 8c13382..0000000
--- a/syslab-python/setup.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from setuptools import setup, find_packages
-
-
-setup(
-    name='syslab',
-    version='0.3.0',
-    author='Tue Vissing Jensen',
-    author_email='tvjens at elektro.dtu.dk',
-    description=('SYSLAB webservice client library.'),
-    long_description=(''),
-    url='https://www.syslab.dk',
-    install_requires=[
-        'requests>=2.18',
-        'beautifulsoup4>=3.7',
-    ],
-    packages=find_packages(exclude=['tests*']),
-    include_package_data=True,
-    entry_points={
-        'console_scripts': [
-        ],
-    },
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Environment :: Console',
-        'Intended Audience :: Science/Research',
-        'License :: Other/Proprietary License',
-        'Natural Language :: English',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Topic :: Scientific/Engineering',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-    ],
-)
diff --git a/syslab-python/syslab_ctrl_log_SP_1687041679.json b/syslab-python/syslab_ctrl_log_SP_1687041679.json
deleted file mode 100644
index e69de29..0000000
diff --git a/syslab-python/tests/__init__.py b/syslab-python/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/syslab-python/tests/runall.py b/syslab-python/tests/runall.py
deleted file mode 100644
index e69de29..0000000
diff --git a/syslab-python/syslab/__init__.py b/syslab/__init__.py
similarity index 100%
rename from syslab-python/syslab/__init__.py
rename to syslab/__init__.py
diff --git a/syslab-python/syslab/comm/LogUtils.py b/syslab/comm/LogUtils.py
similarity index 100%
rename from syslab-python/syslab/comm/LogUtils.py
rename to syslab/comm/LogUtils.py
diff --git a/syslab-python/syslab/comm/__init__.py b/syslab/comm/__init__.py
similarity index 100%
rename from syslab-python/syslab/comm/__init__.py
rename to syslab/comm/__init__.py
diff --git a/syslab-python/syslab/comm/logrec.py b/syslab/comm/logrec.py
similarity index 100%
rename from syslab-python/syslab/comm/logrec.py
rename to syslab/comm/logrec.py
diff --git a/syslab-python/syslab/config.py b/syslab/config.py
similarity index 100%
rename from syslab-python/syslab/config.py
rename to syslab/config.py
diff --git a/syslab-python/syslab/core/SyslabUnit.py b/syslab/core/SyslabUnit.py
similarity index 100%
rename from syslab-python/syslab/core/SyslabUnit.py
rename to syslab/core/SyslabUnit.py
diff --git a/syslab-python/syslab/core/__init__.py b/syslab/core/__init__.py
similarity index 100%
rename from syslab-python/syslab/core/__init__.py
rename to syslab/core/__init__.py
diff --git a/syslab-python/syslab/core/datatypes/BattOpMode.py b/syslab/core/datatypes/BattOpMode.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/BattOpMode.py
rename to syslab/core/datatypes/BattOpMode.py
diff --git a/syslab-python/syslab/core/datatypes/CommonDeviceConfig.py b/syslab/core/datatypes/CommonDeviceConfig.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/CommonDeviceConfig.py
rename to syslab/core/datatypes/CommonDeviceConfig.py
diff --git a/syslab-python/syslab/core/datatypes/CompositeBoolean.py b/syslab/core/datatypes/CompositeBoolean.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/CompositeBoolean.py
rename to syslab/core/datatypes/CompositeBoolean.py
diff --git a/syslab-python/syslab/core/datatypes/CompositeMeasurement.py b/syslab/core/datatypes/CompositeMeasurement.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/CompositeMeasurement.py
rename to syslab/core/datatypes/CompositeMeasurement.py
diff --git a/syslab-python/syslab/core/datatypes/CompositeStatus.py b/syslab/core/datatypes/CompositeStatus.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/CompositeStatus.py
rename to syslab/core/datatypes/CompositeStatus.py
diff --git a/syslab-python/syslab/core/datatypes/ConverterTypes.py b/syslab/core/datatypes/ConverterTypes.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/ConverterTypes.py
rename to syslab/core/datatypes/ConverterTypes.py
diff --git a/syslab-python/syslab/core/datatypes/EVSEState.py b/syslab/core/datatypes/EVSEState.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/EVSEState.py
rename to syslab/core/datatypes/EVSEState.py
diff --git a/syslab-python/syslab/core/datatypes/FlowBatteryState.py b/syslab/core/datatypes/FlowBatteryState.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/FlowBatteryState.py
rename to syslab/core/datatypes/FlowBatteryState.py
diff --git a/syslab-python/syslab/core/datatypes/HeatCirculationPumpMode.py b/syslab/core/datatypes/HeatCirculationPumpMode.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/HeatCirculationPumpMode.py
rename to syslab/core/datatypes/HeatCirculationPumpMode.py
diff --git a/syslab-python/syslab/core/datatypes/HeatCirculationPumpState.py b/syslab/core/datatypes/HeatCirculationPumpState.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/HeatCirculationPumpState.py
rename to syslab/core/datatypes/HeatCirculationPumpState.py
diff --git a/syslab-python/syslab/core/datatypes/Identifiers.py b/syslab/core/datatypes/Identifiers.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/Identifiers.py
rename to syslab/core/datatypes/Identifiers.py
diff --git a/syslab-python/syslab/core/datatypes/__init__.py b/syslab/core/datatypes/__init__.py
similarity index 100%
rename from syslab-python/syslab/core/datatypes/__init__.py
rename to syslab/core/datatypes/__init__.py
diff --git a/syslab-python/syslab/get_flexhouse.py b/syslab/get_flexhouse.py
similarity index 100%
rename from syslab-python/syslab/get_flexhouse.py
rename to syslab/get_flexhouse.py
diff --git a/syslab-python/syslab/physical/B2BConverter.py b/syslab/physical/B2BConverter.py
similarity index 100%
rename from syslab-python/syslab/physical/B2BConverter.py
rename to syslab/physical/B2BConverter.py
diff --git a/syslab-python/syslab/physical/Battery.py b/syslab/physical/Battery.py
similarity index 100%
rename from syslab-python/syslab/physical/Battery.py
rename to syslab/physical/Battery.py
diff --git a/syslab-python/syslab/physical/DieselGenerator.py b/syslab/physical/DieselGenerator.py
similarity index 100%
rename from syslab-python/syslab/physical/DieselGenerator.py
rename to syslab/physical/DieselGenerator.py
diff --git a/syslab-python/syslab/physical/Dumpload.py b/syslab/physical/Dumpload.py
similarity index 100%
rename from syslab-python/syslab/physical/Dumpload.py
rename to syslab/physical/Dumpload.py
diff --git a/syslab-python/syslab/physical/EVSE.py b/syslab/physical/EVSE.py
similarity index 100%
rename from syslab-python/syslab/physical/EVSE.py
rename to syslab/physical/EVSE.py
diff --git a/syslab-python/syslab/physical/HeatSwitchBoard.py b/syslab/physical/HeatSwitchBoard.py
similarity index 100%
rename from syslab-python/syslab/physical/HeatSwitchBoard.py
rename to syslab/physical/HeatSwitchBoard.py
diff --git a/syslab-python/syslab/physical/MeteoMast.py b/syslab/physical/MeteoMast.py
similarity index 100%
rename from syslab-python/syslab/physical/MeteoMast.py
rename to syslab/physical/MeteoMast.py
diff --git a/syslab-python/syslab/physical/Photovoltaics.py b/syslab/physical/Photovoltaics.py
similarity index 100%
rename from syslab-python/syslab/physical/Photovoltaics.py
rename to syslab/physical/Photovoltaics.py
diff --git a/syslab-python/syslab/physical/SwitchBoard.py b/syslab/physical/SwitchBoard.py
similarity index 100%
rename from syslab-python/syslab/physical/SwitchBoard.py
rename to syslab/physical/SwitchBoard.py
diff --git a/syslab-python/syslab/physical/WindTurbine.py b/syslab/physical/WindTurbine.py
similarity index 100%
rename from syslab-python/syslab/physical/WindTurbine.py
rename to syslab/physical/WindTurbine.py
diff --git a/syslab-python/syslab/physical/__init__.py b/syslab/physical/__init__.py
similarity index 100%
rename from syslab-python/syslab/physical/__init__.py
rename to syslab/physical/__init__.py
diff --git a/syslab-python/syslab/virtual/FlexHouse_real.py b/syslab/virtual/FlexHouse_real.py
similarity index 100%
rename from syslab-python/syslab/virtual/FlexHouse_real.py
rename to syslab/virtual/FlexHouse_real.py
diff --git a/syslab-python/syslab/virtual/FlexHouse_sim.py b/syslab/virtual/FlexHouse_sim.py
similarity index 100%
rename from syslab-python/syslab/virtual/FlexHouse_sim.py
rename to syslab/virtual/FlexHouse_sim.py
diff --git a/syslab-python/syslab/virtual/FlexHouse_sim_batt.py b/syslab/virtual/FlexHouse_sim_batt.py
similarity index 100%
rename from syslab-python/syslab/virtual/FlexHouse_sim_batt.py
rename to syslab/virtual/FlexHouse_sim_batt.py
diff --git a/syslab-python/syslab/virtual/MetMast_wb.py b/syslab/virtual/MetMast_wb.py
similarity index 100%
rename from syslab-python/syslab/virtual/MetMast_wb.py
rename to syslab/virtual/MetMast_wb.py
diff --git a/syslab-python/syslab/virtual/WaterBoiler.py b/syslab/virtual/WaterBoiler.py
similarity index 100%
rename from syslab-python/syslab/virtual/WaterBoiler.py
rename to syslab/virtual/WaterBoiler.py
diff --git a/syslab-python/syslab/virtual/__init__.py b/syslab/virtual/__init__.py
similarity index 100%
rename from syslab-python/syslab/virtual/__init__.py
rename to syslab/virtual/__init__.py
diff --git a/syslab-python/syslab/whiteboard/CommModule.py b/syslab/whiteboard/CommModule.py
similarity index 100%
rename from syslab-python/syslab/whiteboard/CommModule.py
rename to syslab/whiteboard/CommModule.py
diff --git a/syslab-python/syslab/whiteboard/WhiteBoardEntry.py b/syslab/whiteboard/WhiteBoardEntry.py
similarity index 100%
rename from syslab-python/syslab/whiteboard/WhiteBoardEntry.py
rename to syslab/whiteboard/WhiteBoardEntry.py
diff --git a/syslab-python/syslab/whiteboard/Whiteboard.py b/syslab/whiteboard/Whiteboard.py
similarity index 100%
rename from syslab-python/syslab/whiteboard/Whiteboard.py
rename to syslab/whiteboard/Whiteboard.py
diff --git a/syslab-python/syslab/whiteboard/__init__.py b/syslab/whiteboard/__init__.py
similarity index 100%
rename from syslab-python/syslab/whiteboard/__init__.py
rename to syslab/whiteboard/__init__.py