diff --git a/README.md b/README.md
index d72933caa..81fc2eb72 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,6 @@ This is the monorepo containing the source code for all of our core projects:
 - [`tauri`](src-tauri/) contains the tauri bindings between binaries and user interface
 - and other crates we use in our binaries
 
-If you're just here for the software, head over to the [releases](https://github.com/UnstoppableSwap/xmr-btc-swap/releases/latest) tab and grab the binary for your operating system! If you're just looking for documentation, check out our [docs page](https://docs.unstoppableswap.net/) or our [github docs](docs/README.md).
+If you're just here for the software, head over to the [releases](https://github.com/UnstoppableSwap/xmr-btc-swap/releases/latest) tab and grab the binary for your operating system! If you're just looking for documentation, check out our [docs page](https://docs.unstoppableswap.net/) or our [github docs](dev-docs/README.md).
 
 Join our [Matrix room](https://matrix.to/#/#unstoppableswap-core:matrix.org) to follow development more closely.
diff --git a/dev-docs/asb/README.md b/dev-docs/asb/README.md
index ccaa42797..66d08b3e1 100644
--- a/dev-docs/asb/README.md
+++ b/dev-docs/asb/README.md
@@ -63,11 +63,11 @@ In particular, you may be interested in setting up your ASB to be reachable via
 
 In order to understand the different components of the ASB and CLI better here is a component diagram showcasing the ASB and CLI setup using public Bitcoin and Monero infrastructure:
 
-![Service Provider scenarios](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/comit-network/xmr-btc-swap/363ce1cdf6fe6478736ff91e1458d650c2319248/docs/asb/diagrams/cli-asb-components-asb-pub-nodes.puml)
+![Service Provider scenarios](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/comit-network/xmr-btc-swap/363ce1cdf6fe6478736ff91e1458d650c2319248/dev-docs/asb/diagrams/cli-asb-components-asb-pub-nodes.puml)
 
 Contrary, here is a diagram that showcases a service provider running it's own blockchain infrastructure for the ASB:
 
-![Service Provider scenarios](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/comit-network/xmr-btc-swap/363ce1cdf6fe6478736ff91e1458d650c2319248/docs/asb/diagrams/cli-asb-components-asb-self-hosted.puml)
+![Service Provider scenarios](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/comit-network/xmr-btc-swap/363ce1cdf6fe6478736ff91e1458d650c2319248/dev-docs/asb/diagrams/cli-asb-components-asb-self-hosted.puml)
 
 The diagram shows that the `asb` group (representing the `asb` binary) consists of three components:
 
diff --git a/src-gui/src/renderer/components/pages/help/ExportDataBox.tsx b/src-gui/src/renderer/components/pages/help/ExportDataBox.tsx
index 60f47abd3..55fa1e997 100644
--- a/src-gui/src/renderer/components/pages/help/ExportDataBox.tsx
+++ b/src-gui/src/renderer/components/pages/help/ExportDataBox.tsx
@@ -95,7 +95,7 @@ function WalletDescriptorModal({
             </li>
             <li>
               For more information on what to do with the descriptor, see our 
-              {" "}<Link href="https://github.com/UnstoppableSwap/core/blob/master/docs/asb/README.md#exporting-the-bitcoin-wallet-descriptor" target="_blank">documentation</Link>
+              {" "}<Link href="https://github.com/UnstoppableSwap/core/blob/master/dev-docs/asb/README.md#exporting-the-bitcoin-wallet-descriptor" target="_blank">documentation</Link>
             </li>
           </ul>
         </DialogContentText>
diff --git a/swap/README.md b/swap/README.md
index 35adc5f0b..69288fedd 100644
--- a/swap/README.md
+++ b/swap/README.md
@@ -24,14 +24,14 @@ You can read [this blogpost](https://comit.network/blog/2021/07/02/transaction-p
 ./swap --testnet buy-xmr --receive-address <YOUR MONERO ADDRESS> --change-address <YOUR BITCOIN CHANGE ADDRESS> --seller <SELLER MULTIADDRESS>
 ```
 
-For more detailed documentation on the CLI, see [this README](./docs/cli/README.md).
+For more detailed documentation on the CLI, see [this README](./dev-docs/cli/README.md).
 
 ## Becoming a Market Maker
 
 Swapping of course needs two parties - and the CLI is only one of them: The taker that occasionally starts a swap with a market maker.
 
 If you are interested in becoming a market maker you will want to run the second binary provided in this repository: `asb` - the Automated Swap Backend.
-Detailed documentation for the `asb` can be found [in this README](./docs/asb/README.md).
+Detailed documentation for the `asb` can be found [in this README](./dev-docs/asb/README.md).
 
 ## Safety
 
diff --git a/swap/tempdb b/swap/tempdb
new file mode 100644
index 000000000..959df1558
Binary files /dev/null and b/swap/tempdb differ