diff --git a/AppRun b/AppRun
index 7940122..c8611d7 100644
--- a/AppRun
+++ b/AppRun
@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/bin/sh
 
 # Firefox specific environment variables
 # https://github.com/AppImage/pkg2appimage/commit/c9b09eb557b6b0b4d914ecb82998148f38880d1d
@@ -13,8 +13,8 @@ if [ -z "$APPDIR" ] ; then
 	export APPDIR="$HERE"
 fi
 
-export PATH="$APPDIR/usr/bin:$PATH"
+#export PATH="$APPDIR/usr/bin:$PATH"
 #export XDG_DATA_DIRS="$APPDIR/share/:$XDG_DATA_DIRS"
-export LD_LIBRARY_PATH="$APPDIR/usr/lib:$LD_LIBRARY_PATH"
+#export LD_LIBRARY_PATH="$APPDIR/usr/lib:$LD_LIBRARY_PATH"
 
-"$APPDIR/usr/bin/floorp" "$@"
+"$APPDIR/floorp" "$@"
diff --git a/floorp_wrapper.sh b/floorp_wrapper.sh
deleted file mode 100644
index f78ab44..0000000
--- a/floorp_wrapper.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -ex
-exec "$APPDIR"/usr/lib/floorp/floorp "\$@"
diff --git a/package.sh b/package.sh
index 14fa7ef..1cd76c7 100755
--- a/package.sh
+++ b/package.sh
@@ -43,56 +43,7 @@ find floorp -name default64.png  -exec cp {} "$APPDIR"/usr/share/icons/hicolor/6
 find floorp -name default128.png -exec cp {} "$APPDIR"/usr/share/icons/hicolor/128x128/apps/floorp.png ';'
 
 # Binaries
-# Install binaries in usr/lib/floorp and a wrapper in usr/bin like arch does it
-# FIXME: since everything goes in one folder it is stupid to create all these folders
-#        and then create a wrapper, just put everything in the main AppDir and
-#        be done with it
-mkdir -p "$APPDIR"/usr/share
-mkdir -p "$APPDIR"/usr/bin
-mkdir -p "$APPDIR"/usr/lib/floorp
-
-cp floorp/floorp           "$APPDIR"/usr/lib/floorp/
-cp floorp/glxtest          "$APPDIR"/usr/lib/floorp/
-cp floorp/pingsender       "$APPDIR"/usr/lib/floorp/
-cp floorp/plugin-container "$APPDIR"/usr/lib/floorp/
-cp floorp/updater          "$APPDIR"/usr/lib/floorp/
-cp floorp/vaapitest        "$APPDIR"/usr/lib/floorp/
-ln -srfv "$APPDIR"/usr/lib/floorp/floorp "$APPDIR"/usr/lib/floorp/floorp-bin
-cp ../floorp_wrapper.sh "$APPDIR"/usr/bin/floorp
-chmod +x "$APPDIR"/usr/bin/floorp
-
-# Libraries
-cp floorp/libfreeblpriv3.so    "$APPDIR"/usr/lib/floorp/
-cp floorp/libipcclientcerts.so "$APPDIR"/usr/lib/floorp/
-cp floorp/liblgpllibs.so       "$APPDIR"/usr/lib/floorp/
-cp floorp/libmozavcodec.so     "$APPDIR"/usr/lib/floorp/
-cp floorp/libmozavutil.so      "$APPDIR"/usr/lib/floorp/
-cp floorp/libmozgtk.so         "$APPDIR"/usr/lib/floorp/
-cp floorp/libmozsandbox.so     "$APPDIR"/usr/lib/floorp/
-cp floorp/libmozsqlite3.so     "$APPDIR"/usr/lib/floorp/
-cp floorp/libmozwayland.so     "$APPDIR"/usr/lib/floorp/
-cp floorp/libnspr4.so          "$APPDIR"/usr/lib/floorp/
-cp floorp/libnss3.so           "$APPDIR"/usr/lib/floorp/
-cp floorp/libnssckbi.so        "$APPDIR"/usr/lib/floorp/
-cp floorp/libnssutil3.so       "$APPDIR"/usr/lib/floorp/
-cp floorp/libplc4.so           "$APPDIR"/usr/lib/floorp/
-cp floorp/libplds4.so          "$APPDIR"/usr/lib/floorp/
-cp floorp/libsmime3.so         "$APPDIR"/usr/lib/floorp/
-cp floorp/libsoftokn3.so       "$APPDIR"/usr/lib/floorp/
-cp floorp/libssl3.so           "$APPDIR"/usr/lib/floorp/
-cp floorp/libxul.so            "$APPDIR"/usr/lib/floorp/
-
-# Bits and Bobs
-cp floorp/omni.ja             "$APPDIR"/usr/lib/floorp/
-cp floorp/platform.ini        "$APPDIR"/usr/lib/floorp/
-cp floorp/update-settings.ini "$APPDIR"/usr/lib/floorp/
-cp floorp/updater.ini         "$APPDIR"/usr/lib/floorp/
-cp -r floorp/browser/         "$APPDIR"/usr/lib/floorp/
-cp -r floorp/defaults/        "$APPDIR"/usr/lib/floorp/
-cp -r floorp/fonts/           "$APPDIR"/usr/lib/floorp/
-cp -r floorp/gmp-clearkey/    "$APPDIR"/usr/lib/floorp/
-cp -r floorp/icons/           "$APPDIR"/usr/lib/floorp/
-
+cp -r floorp/* "$APPDIR"
 
 echo '===# Getting Appimagetool #==='
 wget -nc "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$(uname -m).AppImage" -O appimagetool || true