diff --git a/.dockerignore b/.dockerignore
index 0cd42c6262..f54e609e9b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -54,7 +54,6 @@ src/config/defi-config.h
 src/config/defi-config.h.in
 src/config/stamp-h1
 src/obj
-share/setup.nsi
 
 .deps
 .dirstamp
diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml
index 2e646ea7d3..71b682ae6e 100644
--- a/.github/workflows/build-dev.yaml
+++ b/.github/workflows/build-dev.yaml
@@ -12,7 +12,6 @@ on:
       - master
 
 env:
-  MAKE_CONF_ARGS: --disable-bench
   BUILD_VERSION: latest # Computed
 
 jobs:
@@ -22,7 +21,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
 
     steps:
     - uses: actions/checkout@v3
@@ -64,7 +63,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Build and package
-      run: DOCKERFILE="arm-linux-gnueabihf" TARGET="arm-linux-gnueabihf" ./make.sh docker-release-git
+      run: TARGET="arm-linux-gnueabihf" ./make.sh docker-release-git
 
     - name: Publish artifact - arm-linux-gnueabihf
       uses: actions/upload-artifact@v3
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
index fa79ec1330..1f1e0b0a71 100644
--- a/.github/workflows/build-release.yaml
+++ b/.github/workflows/build-release.yaml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
 
     steps:
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 8382b3e6a7..4ae9f111de 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
     env:
       BUILD_VERSION: latest # Computed
       GITHUB_PULL_REQUEST: ${{ github.event.number }}
diff --git a/.github/workflows/tests-e2e.yaml b/.github/workflows/tests-e2e.yaml
index 1d0a630873..a5abc89fba 100644
--- a/.github/workflows/tests-e2e.yaml
+++ b/.github/workflows/tests-e2e.yaml
@@ -19,9 +19,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
     env:
-      BUILD_VERSION: latest # Computed
       GITHUB_PULL_REQUEST: ${{ github.event.number }}
       PYTHON: 3.6
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
diff --git a/.github/workflows/tests-jellyfish.yml b/.github/workflows/tests-jellyfish.yml
index a082427f50..5e3a477f15 100644
--- a/.github/workflows/tests-jellyfish.yml
+++ b/.github/workflows/tests-jellyfish.yml
@@ -5,7 +5,9 @@ on:
   pull_request:
     branches:
       - master
-
+env:
+  BUILD_VERSION: latest # Computed
+  
 jobs:
   test:
     name: Test
@@ -27,7 +29,7 @@ jobs:
       - name: Set build version
         run: |
           cd defichain
-          DOCKERFILE="x86_64-pc-linux-gnu-clang" TARGET="x86_64-pc-linux-gnu" ./make.sh git_version
+          ./make.sh git_version
 
       - name: Build and package
         run: |
diff --git a/.github/workflows/tests-sync.yml b/.github/workflows/tests-sync.yml
index 5d4513fd97..3ac80fda65 100644
--- a/.github/workflows/tests-sync.yml
+++ b/.github/workflows/tests-sync.yml
@@ -25,7 +25,7 @@ jobs:
         fetch-depth: 0
 
     - name: Build Node
-      run: MAKE_CONF_ARGS="--disable-bench --disable-tests" ./make.sh build
+      run: TARGET="x86_64-pc-linux-gnu" ./make.sh build
 
     - name: Upload Binaries
       uses: actions/upload-artifact@v3
diff --git a/.gitignore b/.gitignore
index e72d4b81d3..b71dd2fdad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,8 +48,6 @@ src/config/defi-config.h
 src/config/defi-config.h.in
 src/config/stamp-h1
 src/obj
-share/setup.nsi
-share/qt/Info.plist
 
 src/univalue/gen
 
diff --git a/Makefile.am b/Makefile.am
index 0792d2c61e..7b25467184 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,13 +13,13 @@ DEFID_BIN=$(top_builddir)/src/$(DEFI_DAEMON_NAME)$(EXEEXT)
 DEFI_CLI_BIN=$(top_builddir)/src/$(DEFI_CLI_NAME)$(EXEEXT)
 DEFI_TX_BIN=$(top_builddir)/src/$(DEFI_TX_NAME)$(EXEEXT)
 
-support_examples_dir = $(pkgdatadir)/examples
-support_examples__DATA = $(top_srcdir)/share/examples/default.conf \
-		$(top_srcdir)/share/examples/pruned.conf
+support_examples_dir = $(pkgdatadir)/conf-examples
+support_examples__DATA = $(top_srcdir)/contrib/conf-examples/default.conf \
+		$(top_srcdir)/contrib/conf-examples/pruned.conf
 
 support_rpcauth_dir = $(pkgdatadir)/rpcauth
-support_rpcauth__DATA = $(top_srcdir)/share/rpcauth/rpcauth.py \
-		$(top_srcdir)/share/rpcauth/README.md
+support_rpcauth__DATA = $(top_srcdir)/contrib/rpcauth/rpcauth.py \
+		$(top_srcdir)/contrib/rpcauth/README.md
 
 support_service_dir = $(pkgdatadir)/service
 support_service__DATA = \
@@ -29,22 +29,22 @@ support_service__DATA = \
 		$(top_srcdir)/contrib/init/defid.service
 
 support_bash_dir = $(datadir)/bash-completion/completions
-support_bash__DATA = $(top_srcdir)/contrib/defi-cli.bash-completion \
-		$(top_srcdir)/contrib/defi-tx.bash-completion \
-		$(top_srcdir)/contrib/defid.bash-completion
+support_bash__DATA = $(top_srcdir)/contrib/bash-completion/defi-cli.bash-completion \
+		$(top_srcdir)/contrib/bash-completion/defi-tx.bash-completion \
+		$(top_srcdir)/contrib/bash-completion/defid.bash-completion
 
 empty :=
 space := $(empty) $(empty)
 
 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
-DIST_CONTRIB = $(top_srcdir)/contrib/defi-cli.bash-completion \
-	       $(top_srcdir)/contrib/defi-tx.bash-completion \
-	       $(top_srcdir)/contrib/defid.bash-completion \
+DIST_CONTRIB = $(top_srcdir)/contrib/bash-completion/defi-cli.bash-completion \
+	       $(top_srcdir)/contrib/bash-completion/defi-tx.bash-completion \
+	       $(top_srcdir)/contrib/bash-completion/defid.bash-completion \
 	       $(top_srcdir)/contrib/init \
 	       $(top_srcdir)/contrib/install_db4.sh
 DIST_SHARE = \
-  $(top_srcdir)/share/genbuild.sh \
-  $(top_srcdir)/share/rpcauth
+  $(top_srcdir)/contrib/genbuild.sh \
+  $(top_srcdir)/contrib/rpcauth
 
 BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
            $(top_srcdir)/contrib/devtools/security-check.py
@@ -197,6 +197,6 @@ clean-docs:
 
 clean-local: clean-docs
 	rm -rf coverage_percent.txt test_defi.coverage/ total.coverage/ test/tmp/ cache/
-	rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__
+	rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache contrib/rpcauth/__pycache__
 	rm -rf osx_volname dist/ dpi36.background.tiff dpi72.background.tiff
 
diff --git a/ci/extended_lint/04_install.sh b/ci/extended_lint/04_install.sh
index cfcaaa87be..4051bcff7c 100755
--- a/ci/extended_lint/04_install.sh
+++ b/ci/extended_lint/04_install.sh
@@ -6,7 +6,7 @@
 
 export LC_ALL=C
 
-CPPCHECK_VERSION=1.86
+CPPCHECK_VERSION=2.10
 curl -s https://codeload.github.com/danmar/cppcheck/tar.gz/${CPPCHECK_VERSION} | tar -zxf - --directory /tmp/
 (cd /tmp/cppcheck-${CPPCHECK_VERSION}/ && make CFGDIR=/tmp/cppcheck-${CPPCHECK_VERSION}/cfg/ > /dev/null)
 export PATH="$PATH:/tmp/cppcheck-${CPPCHECK_VERSION}/"
diff --git a/ci/test/06_script_a.sh b/ci/test/06_script_a.sh
index 1b56dc350a..f7c2a58891 100755
--- a/ci/test/06_script_a.sh
+++ b/ci/test/06_script_a.sh
@@ -28,7 +28,6 @@ END_FOLD
 
 BEGIN_FOLD distdir
 DOCKER_EXEC make distdir VERSION=$HOST
-DOCKER_EXEC cp -r ../share  "defi-$HOST/"
 DOCKER_EXEC cp -r ../contrib  "defi-$HOST/"
 END_FOLD
 
diff --git a/contrib/defi-cli.bash-completion b/contrib/bash-completion/defi-cli.bash-completion
similarity index 100%
rename from contrib/defi-cli.bash-completion
rename to contrib/bash-completion/defi-cli.bash-completion
diff --git a/contrib/defi-tx.bash-completion b/contrib/bash-completion/defi-tx.bash-completion
similarity index 100%
rename from contrib/defi-tx.bash-completion
rename to contrib/bash-completion/defi-tx.bash-completion
diff --git a/contrib/defid.bash-completion b/contrib/bash-completion/defid.bash-completion
similarity index 100%
rename from contrib/defid.bash-completion
rename to contrib/bash-completion/defid.bash-completion
diff --git a/share/examples/default.conf b/contrib/conf-examples/default.conf
similarity index 97%
rename from share/examples/default.conf
rename to contrib/conf-examples/default.conf
index 580bf18f4a..fcd27430bd 100644
--- a/share/examples/default.conf
+++ b/contrib/conf-examples/default.conf
@@ -81,9 +81,9 @@
 # If not, you must set rpcuser and rpcpassword to secure the JSON-RPC API.
 #
 # The config option `rpcauth` can be added to server startup argument. It is set at initialization time
-# using the output from the script in share/rpcauth/rpcauth.py after providing a username:
+# using the output from the script in contrib/rpcauth/rpcauth.py after providing a username:
 #
-# ./share/rpcauth/rpcauth.py alice
+# ./contrib/rpcauth/rpcauth.py alice
 # String to be appended to defi.conf:
 # rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
 # Your password:
diff --git a/share/examples/pruned.conf b/contrib/conf-examples/pruned.conf
similarity index 97%
rename from share/examples/pruned.conf
rename to contrib/conf-examples/pruned.conf
index b779d80cb7..1c80037f44 100644
--- a/share/examples/pruned.conf
+++ b/contrib/conf-examples/pruned.conf
@@ -81,9 +81,9 @@
 # If not, you must set rpcuser and rpcpassword to secure the JSON-RPC API.
 #
 # The config option `rpcauth` can be added to server startup argument. It is set at initialization time
-# using the output from the script in share/rpcauth/rpcauth.py after providing a username:
+# using the output from the script in contrib/rpcauth/rpcauth.py after providing a username:
 #
-# ./share/rpcauth/rpcauth.py alice
+# ./contrib/rpcauth/rpcauth.py alice
 # String to be appended to defi.conf:
 # rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
 # Your password:
diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py
index ed6b2d8c1f..ad9c83c3fd 100755
--- a/contrib/devtools/optimize-pngs.py
+++ b/contrib/devtools/optimize-pngs.py
@@ -26,7 +26,7 @@ def content_hash(filename):
 
 pngcrush = 'pngcrush'
 git = 'git'
-folders = ["share/pixmaps"]
+folders = ["contrib/pixmaps"]
 basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel'], universal_newlines=True, encoding='utf8').rstrip('\n')
 totalSaveBytes = 0
 noHashChange = True
diff --git a/contrib/dockerfiles/aarch64-linux-gnu.dockerfile b/contrib/dockerfiles/aarch64-linux-gnu.dockerfile
index a38e61c9f0..6588c2c69c 100644
--- a/contrib/dockerfiles/aarch64-linux-gnu.dockerfile
+++ b/contrib/dockerfiles/aarch64-linux-gnu.dockerfile
@@ -1,7 +1,7 @@
 ARG TARGET=aarch64-linux-gnu
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM ubuntu:latest as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -27,7 +27,6 @@ RUN ./make.sh clean-depends && ./make.sh build-deps
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -44,7 +43,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM arm64v8/ubuntu:20.04
+FROM --platform=linux/arm64 ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}
diff --git a/contrib/dockerfiles/arm-linux-gnueabihf.dockerfile b/contrib/dockerfiles/arm-linux-gnueabihf.dockerfile
index 11ab4cd282..8869076467 100644
--- a/contrib/dockerfiles/arm-linux-gnueabihf.dockerfile
+++ b/contrib/dockerfiles/arm-linux-gnueabihf.dockerfile
@@ -1,7 +1,7 @@
 ARG TARGET=arm-linux-gnueabihf
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM ubuntu:latest as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -27,7 +27,6 @@ RUN ./make.sh clean-depends && ./make.sh build-deps
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -44,7 +43,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM arm32v7/ubuntu:20.04
+FROM --platform=linux/arm/v7 ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}
diff --git a/contrib/dockerfiles/x86_64-apple-darwin18.dockerfile b/contrib/dockerfiles/x86_64-apple-darwin18.dockerfile
index 1a885ef418..28e81ec915 100644
--- a/contrib/dockerfiles/x86_64-apple-darwin18.dockerfile
+++ b/contrib/dockerfiles/x86_64-apple-darwin18.dockerfile
@@ -1,7 +1,7 @@
 ARG TARGET=x86_64-apple-darwin18
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM ubuntu:latest as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -28,7 +28,6 @@ RUN ./make.sh clean-depends && ./make.sh build-deps
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -45,7 +44,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM ubuntu:20.04
+FROM ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}
diff --git a/contrib/dockerfiles/x86_64-pc-linux-gnu-clang.dockerfile b/contrib/dockerfiles/x86_64-pc-linux-gnu-clang.dockerfile
index a1f66b9e47..7d91459d65 100644
--- a/contrib/dockerfiles/x86_64-pc-linux-gnu-clang.dockerfile
+++ b/contrib/dockerfiles/x86_64-pc-linux-gnu-clang.dockerfile
@@ -1,7 +1,7 @@
 ARG TARGET=x86_64-pc-linux-gnu
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM debian:10 as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -22,12 +22,13 @@ LABEL org.defichain.arch=${TARGET}
 WORKDIR /work
 COPY ./depends ./depends
 
-RUN ./make.sh clean-depends && ./make.sh build-deps
+RUN ./make.sh clean-depends && \
+    export MAKE_DEPS_ARGS="x86_64_linux_CC=clang-16 x86_64_linux_CXX=clang++-16" && \
+    ./make.sh build-deps
 
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -45,7 +46,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM ubuntu:20.04
+FROM ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}
diff --git a/contrib/dockerfiles/x86_64-pc-linux-gnu-dev.dockerfile b/contrib/dockerfiles/x86_64-pc-linux-gnu-dev.dockerfile
deleted file mode 100644
index 96c47db783..0000000000
--- a/contrib/dockerfiles/x86_64-pc-linux-gnu-dev.dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-ARG TARGET=x86_64-pc-linux-gnu
-
-FROM defichain-builder-base-${TARGET}
-ARG TARGET
-LABEL org.defichain.name="defichain-dev"
-LABEL org.defichain.arch=${TARGET}
-
-WORKDIR /data
-COPY . .
-
-VOLUME [ "/data" ]
-CMD [ "bash", "-c", "./make.sh release" ]
\ No newline at end of file
diff --git a/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile b/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile
index 26c018da03..cc4aa29a5b 100644
--- a/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile
+++ b/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile
@@ -1,7 +1,7 @@
 ARG TARGET=x86_64-pc-linux-gnu
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM ubuntu:latest as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -26,7 +26,6 @@ RUN ./make.sh clean-depends && ./make.sh build-deps
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -44,7 +43,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM ubuntu:20.04
+FROM ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}
diff --git a/contrib/dockerfiles/x86_64-w64-mingw32.dockerfile b/contrib/dockerfiles/x86_64-w64-mingw32.dockerfile
index 51f7ab4c8f..901e3212f2 100644
--- a/contrib/dockerfiles/x86_64-w64-mingw32.dockerfile
+++ b/contrib/dockerfiles/x86_64-w64-mingw32.dockerfile
@@ -1,7 +1,7 @@
 ARG TARGET=x86_64-w64-mingw32
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM ubuntu:latest as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -30,7 +30,6 @@ RUN ./make.sh clean-depends && ./make.sh build-deps
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -47,7 +46,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM ubuntu:20.04
+FROM ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}
diff --git a/share/genbuild.sh b/contrib/genbuild.sh
similarity index 97%
rename from share/genbuild.sh
rename to contrib/genbuild.sh
index 8e8370fb99..35f2e02f62 100755
--- a/share/genbuild.sh
+++ b/contrib/genbuild.sh
@@ -25,7 +25,7 @@ git_check_in_repo() {
 DESC=""
 SUFFIX=""
 CURRENT_BRANCH=""
-if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then
+if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo contrib/genbuild.sh; then
     # clean 'dirty' status of touched files that haven't been modified
     git diff >/dev/null 2>/dev/null
 
diff --git a/share/pixmaps/defi.ico b/contrib/pixmaps/defi.ico
similarity index 100%
rename from share/pixmaps/defi.ico
rename to contrib/pixmaps/defi.ico
diff --git a/share/pixmaps/defi128.png b/contrib/pixmaps/defi128.png
similarity index 100%
rename from share/pixmaps/defi128.png
rename to contrib/pixmaps/defi128.png
diff --git a/share/pixmaps/defi128.xpm b/contrib/pixmaps/defi128.xpm
similarity index 100%
rename from share/pixmaps/defi128.xpm
rename to contrib/pixmaps/defi128.xpm
diff --git a/share/pixmaps/defi16.png b/contrib/pixmaps/defi16.png
similarity index 100%
rename from share/pixmaps/defi16.png
rename to contrib/pixmaps/defi16.png
diff --git a/share/pixmaps/defi16.xpm b/contrib/pixmaps/defi16.xpm
similarity index 100%
rename from share/pixmaps/defi16.xpm
rename to contrib/pixmaps/defi16.xpm
diff --git a/share/pixmaps/defi256.png b/contrib/pixmaps/defi256.png
similarity index 100%
rename from share/pixmaps/defi256.png
rename to contrib/pixmaps/defi256.png
diff --git a/share/pixmaps/defi256.xpm b/contrib/pixmaps/defi256.xpm
similarity index 100%
rename from share/pixmaps/defi256.xpm
rename to contrib/pixmaps/defi256.xpm
diff --git a/share/pixmaps/defi32.png b/contrib/pixmaps/defi32.png
similarity index 100%
rename from share/pixmaps/defi32.png
rename to contrib/pixmaps/defi32.png
diff --git a/share/pixmaps/defi32.xpm b/contrib/pixmaps/defi32.xpm
similarity index 100%
rename from share/pixmaps/defi32.xpm
rename to contrib/pixmaps/defi32.xpm
diff --git a/share/pixmaps/defi64.png b/contrib/pixmaps/defi64.png
similarity index 100%
rename from share/pixmaps/defi64.png
rename to contrib/pixmaps/defi64.png
diff --git a/share/pixmaps/defi64.xpm b/contrib/pixmaps/defi64.xpm
similarity index 100%
rename from share/pixmaps/defi64.xpm
rename to contrib/pixmaps/defi64.xpm
diff --git a/share/rpcauth/README.md b/contrib/rpcauth/README.md
similarity index 91%
rename from share/rpcauth/README.md
rename to contrib/rpcauth/README.md
index 6f627b867b..49f197a13a 100644
--- a/share/rpcauth/README.md
+++ b/contrib/rpcauth/README.md
@@ -1,7 +1,7 @@
 RPC Tools
 ---------------------
 
-### [RPCAuth](/share/rpcauth) ###
+### [RPCAuth](/contrib/rpcauth) ###
 
 ```
 usage: rpcauth.py [-h] username [password]
diff --git a/share/rpcauth/rpcauth.py b/contrib/rpcauth/rpcauth.py
similarity index 100%
rename from share/rpcauth/rpcauth.py
rename to contrib/rpcauth/rpcauth.py
diff --git a/depends/packages/native_cdrkit.mk b/depends/packages/native_cdrkit.mk
deleted file mode 100644
index 8243458ec8..0000000000
--- a/depends/packages/native_cdrkit.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-package=native_cdrkit
-$(package)_version=1.1.11
-$(package)_download_path=https://distro.ibiblio.org/fatdog/source/600/c
-$(package)_file_name=cdrkit-$($(package)_version).tar.bz2
-$(package)_sha256_hash=b50d64c214a65b1a79afe3a964c691931a4233e2ba605d793eb85d0ac3652564
-$(package)_patches=cdrkit-deterministic.patch
-
-define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/cdrkit-deterministic.patch
-endef
-
-define $(package)_config_cmds
-  cmake -DCMAKE_INSTALL_PREFIX=$(build_prefix)
-endef
-
-define $(package)_build_cmds
-  $(MAKE) genisoimage
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) -C genisoimage install
-endef
-
-define $(package)_postprocess_cmds
-  rm bin/isovfy bin/isoinfo bin/isodump bin/isodebug bin/devdump
-endef
diff --git a/depends/packages/native_libdmg-hfsplus.mk b/depends/packages/native_libdmg-hfsplus.mk
deleted file mode 100644
index a4ffb6046c..0000000000
--- a/depends/packages/native_libdmg-hfsplus.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-package=native_libdmg-hfsplus
-$(package)_version=0.1
-$(package)_download_path=https://github.com/theuni/libdmg-hfsplus/archive
-$(package)_file_name=libdmg-hfsplus-v$($(package)_version).tar.gz
-$(package)_sha256_hash=6569a02eb31c2827080d7d59001869ea14484c281efab0ae7f2b86af5c3120b3
-$(package)_build_subdir=build
-
-define $(package)_preprocess_cmds
-  mkdir build
-endef
-
-define $(package)_config_cmds
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix)/bin ..
-endef
-
-define $(package)_build_cmds
-  $(MAKE) -C dmg
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) -C dmg install
-endef
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index ea003be486..06c1e9e15f 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -11,5 +11,5 @@ upnp_packages=miniupnpc
 darwin_native_packages = native_biplist native_ds_store native_mac_alias
 
 ifneq ($(build_os),darwin)
-darwin_native_packages += native_cctools native_cdrkit native_libdmg-hfsplus
+darwin_native_packages += native_cctools
 endif
diff --git a/doc/JSON-RPC-interface.md b/doc/JSON-RPC-interface.md
index f533135150..37f6162ea9 100644
--- a/doc/JSON-RPC-interface.md
+++ b/doc/JSON-RPC-interface.md
@@ -79,7 +79,7 @@ RPC interface will be abused.
   configuration directory, and using these credentials is the preferred
   RPC authentication method.  If you need to generate static login
   credentials for your programs, you can use the script in the
-  `share/rpcauth` directory in the Bitcoin Core source tree.  As a final
+  `contrib/rpcauth` directory in the Bitcoin Core source tree.  As a final
   fallback, you can directly use manually-chosen `rpcuser` and
   `rpcpassword` configuration parameters---but you must ensure that you
   choose a strong and unique passphrase (and still don't use insecure
diff --git a/doc/defi-conf.md b/doc/defi-conf.md
index 44dfc8e6b4..16c1df0bc0 100644
--- a/doc/defi-conf.md
+++ b/doc/defi-conf.md
@@ -59,4 +59,4 @@ Windows | `%APPDATA%\DeFi Blockchain\` | `C:\Users\username\AppData\Roaming\DeFi
 Linux | `$HOME/.defi/` | `/home/username/.defi/defi.conf`
 macOS | `$HOME/Library/Application Support/DeFi/` | `/Users/username/Library/Application Support/DeFi/defi.conf`
 
-You can find an example defi.conf file in [share/examples/defi.conf](../share/examples/defi.conf).
+You can find an example defi.conf file in [contrib/conf-examples/defi.conf](../contrib/conf-examples/defi.conf).
diff --git a/doc/init.md b/doc/init.md
index 2726810c77..a2f34bd8c2 100644
--- a/doc/init.md
+++ b/doc/init.md
@@ -43,7 +43,7 @@ This allows for running defid without having to do any manual configuration.
 relative to the data directory. `wallet` *only* supports relative paths.
 
 For an example configuration file that describes the configuration settings,
-see `share/examples/defi.conf`.
+see `contrib/conf-examples/defi.conf`.
 
 Paths
 ---------------------------------
diff --git a/doc/setup-nodes-docker.md b/doc/setup-nodes-docker.md
index 65301b526c..1f55bb16af 100644
--- a/doc/setup-nodes-docker.md
+++ b/doc/setup-nodes-docker.md
@@ -136,14 +136,14 @@ In the background, `defi-cli` read the information automatically from `/data/reg
 
 #### Using rpcauth for remote authentication
 
-Before setting up remote authentication, you will need to generate the `rpcauth` line that will hold the credentials for the DeFi Blockchain daemon. You can either do this yourself by constructing the line with the format `<user>:<salt>$<hash>` or use the official [`rpcauth.py`](https://github.com/DeFiCh/ain/blob/master/share/rpcauth/rpcauth.py)  script to generate this line for you, including a random password that is printed to the console.
+Before setting up remote authentication, you will need to generate the `rpcauth` line that will hold the credentials for the DeFi Blockchain daemon. You can either do this yourself by constructing the line with the format `<user>:<salt>$<hash>` or use the official [`rpcauth.py`](https://github.com/DeFiCh/ain/blob/master/contrib/rpcauth/rpcauth.py)  script to generate this line for you, including a random password that is printed to the console.
 
 _Note: This is a Python 3 script. use `[...] | python3 - <username>` when executing on macOS._
 
 Example:
 
 ```sh
-❯ curl -sSL https://raw.githubusercontent.com/DeFiCh/ain/master/share/rpcauth/rpcauth.py | python - <username>
+❯ curl -sSL https://raw.githubusercontent.com/DeFiCh/ain/master/contrib/rpcauth/rpcauth.py | python - <username>
 
 String to be appended to defi.conf:
 rpcauth=foo:7d9ba5ae63c3d4dc30583ff4fe65a67e$9e3634e81c11659e3de036d0bf88f89cd169c1039e6e09607562d54765c649cc
diff --git a/make.sh b/make.sh
index a483216efe..0e874c3ffc 100755
--- a/make.sh
+++ b/make.sh
@@ -339,6 +339,9 @@ get_default_conf_args() {
     fi
     conf_args="${conf_args} --enable-static";
     conf_args="${conf_args} --enable-reduce-exports";
+    conf_args="${conf_args} LDFLAGS=-static-libgcc";
+    # Note: https://stackoverflow.com/questions/13636513/linking-libstdc-statically-any-gotchas
+    # We don't use dynamic loading at the time being
     conf_args="${conf_args} LDFLAGS=-static-libstdc++";
     echo "$conf_args"
 }
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a31b7097c..a6afc116d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -281,7 +281,7 @@ DEFI_CORE_H = \
 
 obj/build.h: FORCE
 	@$(MKDIR_P) $(builddir)/obj
-	@$(top_srcdir)/share/genbuild.sh "$(abs_top_builddir)/src/obj/build.h" \
+	@$(top_srcdir)/contrib/genbuild.sh "$(abs_top_builddir)/src/obj/build.h" \
 	  "$(abs_top_srcdir)"
 libdefi_util_a-clientversion.$(OBJEXT): obj/build.h
 
diff --git a/test/config.ini.in b/test/config.ini.in
index e57dc24d99..a5e0537956 100644
--- a/test/config.ini.in
+++ b/test/config.ini.in
@@ -10,7 +10,7 @@ PACKAGE_NAME=@PACKAGE_NAME@
 SRCDIR=@abs_top_srcdir@
 BUILDDIR=@abs_top_builddir@
 EXEEXT=@EXEEXT@
-RPCAUTH=@abs_top_srcdir@/share/rpcauth/rpcauth.py
+RPCAUTH=@abs_top_srcdir@/contrib/rpcauth/rpcauth.py
 
 [components]
 # Which components are enabled. These are commented out by `configure` if they were disabled when running config.
diff --git a/test/util/rpcauth-test.py b/test/util/rpcauth-test.py
index 1cd3681e4f..7c1824e53f 100755
--- a/test/util/rpcauth-test.py
+++ b/test/util/rpcauth-test.py
@@ -2,7 +2,7 @@
 # Copyright (c) 2015-2018 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
-"""Test share/rpcauth/rpcauth.py
+"""Test contrib/rpcauth/rpcauth.py
 """
 import base64
 import configparser