diff --git a/pythonfmu/pythonfmu-export/.clang-format b/.clang-format
similarity index 100%
rename from pythonfmu/pythonfmu-export/.clang-format
rename to .clang-format
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7e7c0e10..ea9e4a5d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
         os: [ubuntu-22.04, windows-2022]
     
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python 3.x
         uses: actions/setup-python@v2
@@ -28,20 +28,14 @@ jobs:
       - name: Compile wrapper on Windows
         if: startsWith(runner.os, 'Windows')
         run: |
-          mkdir tmp-build
-          cd tmp-build
-          cmake $Env:github_workspace/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release -A x64
-          cmake --build . --config Release
-          cd ..
+          cmake . -B build -DCMAKE_BUILD_TYPE=Release -A x64
+          cmake --build build --config Release
 
       - name: Compile wrapper on Linux / macOS
         if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
         run: |
-          mkdir tmp-build
-          cd tmp-build
-          cmake $GITHUB_WORKSPACE/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release
-          cmake --build . --config Release
-          cd ..
+          cmake . -B build -DCMAKE_BUILD_TYPE=Release
+          cmake --build build
 
       - name: Archive wrapper library
         uses: actions/upload-artifact@v4
@@ -53,7 +47,7 @@ jobs:
     needs: build-wrapper
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python 3.x
         uses: actions/setup-python@v2
@@ -90,7 +84,7 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python 3.x
         uses: actions/setup-python@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4662447d..f644d2ec 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ jobs:
         os: [ubuntu-22.04, windows-2022]
     
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup Python 3.x
         uses: actions/setup-python@v2
         with:
@@ -22,19 +22,13 @@ jobs:
       - name: Compile wrapper on Windows
         if: startsWith(runner.os, 'Windows')
         run: |
-          mkdir tmp-build
-          cd tmp-build
-          cmake $Env:github_workspace/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release -A x64
-          cmake --build . --config Release
-          cd ..
+          cmake . -B build -DCMAKE_BUILD_TYPE=Release -A x64
+          cmake --build build --config Release
       - name: Compile wrapper on Linux / macOS
         if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
         run: |
-          mkdir tmp-build
-          cd tmp-build
-          cmake $GITHUB_WORKSPACE/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release
-          cmake --build .
-          cd ..
+          cmake . -B build -DCMAKE_BUILD_TYPE=Release
+          cmake --build build
       - name: Archive wrapper library
         uses: actions/upload-artifact@v4
         with:
@@ -45,7 +39,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
diff --git a/pythonfmu/pythonfmu-export/CMakeLists.txt b/CMakeLists.txt
similarity index 98%
rename from pythonfmu/pythonfmu-export/CMakeLists.txt
rename to CMakeLists.txt
index 66533a89..1643f96c 100644
--- a/pythonfmu/pythonfmu-export/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.18)
-project(pythonfmu-export VERSION 0.2.0)
+project(pythonfmu-export)
 
 # ==============================================================================
 # Build settings
diff --git a/pythonfmu/pythonfmu-export/build_unix.sh b/build_unix.sh
similarity index 100%
rename from pythonfmu/pythonfmu-export/build_unix.sh
rename to build_unix.sh
diff --git a/pythonfmu/pythonfmu-export/build_win.sh b/build_win.sh
similarity index 100%
rename from pythonfmu/pythonfmu-export/build_win.sh
rename to build_win.sh
diff --git a/pythonfmu/pythonfmu-export/src/CMakeLists.txt b/src/CMakeLists.txt
similarity index 84%
rename from pythonfmu/pythonfmu-export/src/CMakeLists.txt
rename to src/CMakeLists.txt
index 98612dd7..04953765 100644
--- a/pythonfmu/pythonfmu-export/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,11 +27,11 @@ target_link_libraries (pythonfmu-export PRIVATE Python3::Module)
 if (WIN32)
   set_target_properties(pythonfmu-export
           PROPERTIES
-          RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/../resources/binaries/${TARGET_PLATFORM}"
+          RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/pythonfmu/resources/binaries/${TARGET_PLATFORM}"
           )
 else ()
   set_target_properties(pythonfmu-export
           PROPERTIES
-          LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/../resources/binaries/${TARGET_PLATFORM}"
+          LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/pythonfmu/resources/binaries/${TARGET_PLATFORM}"
           )
 endif ()
diff --git a/pythonfmu/pythonfmu-export/src/fmi/fmi2FunctionTypes.h b/src/fmi/fmi2FunctionTypes.h
similarity index 100%
rename from pythonfmu/pythonfmu-export/src/fmi/fmi2FunctionTypes.h
rename to src/fmi/fmi2FunctionTypes.h
diff --git a/pythonfmu/pythonfmu-export/src/fmi/fmi2Functions.h b/src/fmi/fmi2Functions.h
similarity index 100%
rename from pythonfmu/pythonfmu-export/src/fmi/fmi2Functions.h
rename to src/fmi/fmi2Functions.h
diff --git a/pythonfmu/pythonfmu-export/src/fmi/fmi2TypesPlatform.h b/src/fmi/fmi2TypesPlatform.h
similarity index 100%
rename from pythonfmu/pythonfmu-export/src/fmi/fmi2TypesPlatform.h
rename to src/fmi/fmi2TypesPlatform.h
diff --git a/pythonfmu/pythonfmu-export/src/pythonfmu/IPyState.hpp b/src/pythonfmu/IPyState.hpp
similarity index 100%
rename from pythonfmu/pythonfmu-export/src/pythonfmu/IPyState.hpp
rename to src/pythonfmu/IPyState.hpp
diff --git a/pythonfmu/pythonfmu-export/src/pythonfmu/Logger.hpp b/src/pythonfmu/Logger.hpp
similarity index 100%
rename from pythonfmu/pythonfmu-export/src/pythonfmu/Logger.hpp
rename to src/pythonfmu/Logger.hpp
diff --git a/pythonfmu/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp b/src/pythonfmu/PySlaveInstance.cpp
similarity index 100%
rename from pythonfmu/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp
rename to src/pythonfmu/PySlaveInstance.cpp
diff --git a/pythonfmu/pythonfmu-export/src/pythonfmu/PyState.hpp b/src/pythonfmu/PyState.hpp
similarity index 100%
rename from pythonfmu/pythonfmu-export/src/pythonfmu/PyState.hpp
rename to src/pythonfmu/PyState.hpp
diff --git a/pythonfmu/pythonfmu-export/src/pythonfmu/SlaveInstance.hpp b/src/pythonfmu/SlaveInstance.hpp
similarity index 100%
rename from pythonfmu/pythonfmu-export/src/pythonfmu/SlaveInstance.hpp
rename to src/pythonfmu/SlaveInstance.hpp
diff --git a/pythonfmu/pythonfmu-export/src/pythonfmu/fmi2.cpp b/src/pythonfmu/fmi2.cpp
similarity index 100%
rename from pythonfmu/pythonfmu-export/src/pythonfmu/fmi2.cpp
rename to src/pythonfmu/fmi2.cpp
diff --git a/pythonfmu/pythonfmu-export/src/pythonfmu/fmu_except.hpp b/src/pythonfmu/fmu_except.hpp
similarity index 100%
rename from pythonfmu/pythonfmu-export/src/pythonfmu/fmu_except.hpp
rename to src/pythonfmu/fmu_except.hpp