diff --git a/Dockerfile b/Dockerfile
index c05508dd..9dd7d0ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ LABEL maintainer="nemchik"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
+ENV NZBHYDRA2_RELEASE_TYPE="Release"
 
 RUN \
  echo "**** install packages ****" && \
@@ -29,12 +30,10 @@ RUN \
  curl -o \
  /tmp/nzbhydra2.zip -L \
 	"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
- mkdir -p /app/nzbhydra2 && \
- unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
- curl -o \
- /app/nzbhydra2/nzbhydra2wrapperPy3.py -L \
-	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
- chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
+ mkdir -p /app/nzbhydra2/bin && \
+ unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
+ chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
+ echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 1ab438c7..d7a5dc5a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -9,6 +9,7 @@ LABEL maintainer="nemchik"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
+ENV NZBHYDRA2_RELEASE_TYPE="Release"
 
 RUN \
  echo "**** install packages ****" && \
@@ -29,12 +30,10 @@ RUN \
  curl -o \
  /tmp/nzbhydra2.zip -L \
 	"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
- mkdir -p /app/nzbhydra2 && \
- unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
- curl -o \
- /app/nzbhydra2/nzbhydra2wrapperPy3.py -L \
-	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
- chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
+ mkdir -p /app/nzbhydra2/bin && \
+ unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
+ chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
+ echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 56d11416..ad0e6a7e 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -9,6 +9,7 @@ LABEL maintainer="nemchik"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
+ENV NZBHYDRA2_RELEASE_TYPE="Release"
 
 RUN \
  echo "**** install packages ****" && \
@@ -29,12 +30,10 @@ RUN \
  curl -o \
  /tmp/nzbhydra2.zip -L \
 	"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
- mkdir -p /app/nzbhydra2 && \
- unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
- curl -o \
- /app/nzbhydra2/nzbhydra2wrapperPy3.py -L \
-	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
- chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
+ mkdir -p /app/nzbhydra2/bin && \
+ unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
+ chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
+ echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \
diff --git a/README.md b/README.md
index d84a6af6..919c0685 100644
--- a/README.md
+++ b/README.md
@@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **01.05.20:** - Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip.
 * **14.04.20:** - Correct Name, Hydra2 -> NZBHydra2.
 * **08.01.20:** - Switch to python3.
 * **05.01.20:** - Add dev tag for prereleases.
diff --git a/readme-vars.yml b/readme-vars.yml
index fa265ce0..94b02fcd 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -56,6 +56,7 @@ app_setup_block: |
 # changelog
 
 changelogs:
+  - { date: "01.05.20:", desc: "Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip." }
   - { date: "14.04.20:", desc: "Correct Name, Hydra2 -> NZBHydra2." }
   - { date: "08.01.20:", desc: "Switch to python3." }
   - { date: "05.01.20:", desc: "Add dev tag for prereleases." }
diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index b5e6163a..44e3a20b 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -5,5 +5,5 @@ mkdir -p /config/logs
 
 
 # permissions
-chmod +x /app/nzbhydra2/nzbhydra2
+chmod +x /app/nzbhydra2/bin/nzbhydra2
 chown -R abc:abc /config
diff --git a/root/etc/services.d/nzbhydra2/run b/root/etc/services.d/nzbhydra2/run
index a56303e6..46d9439d 100644
--- a/root/etc/services.d/nzbhydra2/run
+++ b/root/etc/services.d/nzbhydra2/run
@@ -3,7 +3,7 @@
 # unset unraid specific ENV to avoid crashing
 unset HOST_OS
 
-cd /app/nzbhydra2 || exit
+cd /app/nzbhydra2/bin || exit
 
 exec \
 	s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py \