diff --git a/app-updater b/app-updater
index 3c83c0b..7b13679 100755
--- a/app-updater
+++ b/app-updater
@@ -118,6 +118,6 @@ IFS="$PREIFS"
 #.git folder
 #move old .git folder to trash
 gio trash "${DIRECTORY}/.git" 2>/dev/null
-cp -f "${DIRECTORY}/update/pi-apps/.git" "${DIRECTORY}/.git" || error "Failed to copy new .git!"
+cp -rf "${DIRECTORY}/update/pi-apps/.git" "${DIRECTORY}/.git" || error "Failed to copy new .git!"
 
 
diff --git a/data/installed-packages/Arduino b/data/installed-packages/Arduino
deleted file mode 100644
index 8b13789..0000000
--- a/data/installed-packages/Arduino
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/installed-packages/TBOPlayer b/data/installed-packages/TBOPlayer
deleted file mode 100644
index 36552a6..0000000
--- a/data/installed-packages/TBOPlayer
+++ /dev/null
@@ -1,2 +0,0 @@
- libav-tools
-
diff --git a/data/status/Arduino b/data/status/Arduino
deleted file mode 100644
index f94d6ed..0000000
--- a/data/status/Arduino
+++ /dev/null
@@ -1 +0,0 @@
-installed
diff --git a/data/status/BalenaEtcher b/data/status/BalenaEtcher
deleted file mode 100644
index f94d6ed..0000000
--- a/data/status/BalenaEtcher
+++ /dev/null
@@ -1 +0,0 @@
-installed
diff --git a/data/status/Chromium Media Edition b/data/status/Chromium Media Edition
deleted file mode 100644
index f94d6ed..0000000
--- a/data/status/Chromium Media Edition	
+++ /dev/null
@@ -1 +0,0 @@
-installed
diff --git a/data/status/CommanderPi b/data/status/CommanderPi
deleted file mode 100644
index 6e88c9b..0000000
--- a/data/status/CommanderPi
+++ /dev/null
@@ -1 +0,0 @@
-uninstalled
diff --git a/data/status/Cool Retro Term b/data/status/Cool Retro Term
deleted file mode 100644
index f94d6ed..0000000
--- a/data/status/Cool Retro Term	
+++ /dev/null
@@ -1 +0,0 @@
-installed
diff --git a/data/status/Cura b/data/status/Cura
deleted file mode 100644
index f94d6ed..0000000
--- a/data/status/Cura
+++ /dev/null
@@ -1 +0,0 @@
-installed
diff --git a/data/status/FreeCAD b/data/status/FreeCAD
deleted file mode 100644
index 6e88c9b..0000000
--- a/data/status/FreeCAD
+++ /dev/null
@@ -1 +0,0 @@
-uninstalled
diff --git a/data/status/FreeCAD (precompiled) b/data/status/FreeCAD (precompiled)
deleted file mode 100644
index f94d6ed..0000000
--- a/data/status/FreeCAD (precompiled)	
+++ /dev/null
@@ -1 +0,0 @@
-installed
diff --git a/data/status/Pi Power Tools b/data/status/Pi Power Tools
deleted file mode 100644
index f94d6ed..0000000
--- a/data/status/Pi Power Tools	
+++ /dev/null
@@ -1 +0,0 @@
-installed
diff --git a/data/status/Raspi2png b/data/status/Raspi2png
deleted file mode 100644
index f94d6ed..0000000
--- a/data/status/Raspi2png
+++ /dev/null
@@ -1 +0,0 @@
-installed
diff --git a/data/status/TBOPlayer b/data/status/TBOPlayer
deleted file mode 100644
index f94d6ed..0000000
--- a/data/status/TBOPlayer
+++ /dev/null
@@ -1 +0,0 @@
-installed
diff --git a/data/update-status/Arduino b/data/update-status/Arduino
deleted file mode 100644
index d669e17..0000000
--- a/data/update-status/Arduino
+++ /dev/null
@@ -1 +0,0 @@
-updatable
diff --git a/data/update-status/Arduino2 b/data/update-status/Arduino2
deleted file mode 100644
index 4083037..0000000
--- a/data/update-status/Arduino2
+++ /dev/null
@@ -1 +0,0 @@
-local
diff --git a/data/update-status/BalenaEtcher b/data/update-status/BalenaEtcher
deleted file mode 100644
index a0f9a4b..0000000
--- a/data/update-status/BalenaEtcher
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/data/update-status/Chromium Media Edition b/data/update-status/Chromium Media Edition
deleted file mode 100644
index 3e75765..0000000
--- a/data/update-status/Chromium Media Edition	
+++ /dev/null
@@ -1 +0,0 @@
-new
diff --git a/data/update-status/CommanderPi b/data/update-status/CommanderPi
deleted file mode 100644
index a0f9a4b..0000000
--- a/data/update-status/CommanderPi
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/data/update-status/Cool Retro Term b/data/update-status/Cool Retro Term
deleted file mode 100644
index a0f9a4b..0000000
--- a/data/update-status/Cool Retro Term	
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/data/update-status/Cura b/data/update-status/Cura
deleted file mode 100644
index a0f9a4b..0000000
--- a/data/update-status/Cura
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/data/update-status/FreeCAD b/data/update-status/FreeCAD
deleted file mode 100644
index a0f9a4b..0000000
--- a/data/update-status/FreeCAD
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/data/update-status/FreeCAD (precompiled) b/data/update-status/FreeCAD (precompiled)
deleted file mode 100644
index a0f9a4b..0000000
--- a/data/update-status/FreeCAD (precompiled)	
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/data/update-status/Pi Power Tools b/data/update-status/Pi Power Tools
deleted file mode 100644
index a0f9a4b..0000000
--- a/data/update-status/Pi Power Tools	
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/data/update-status/Raspi2png b/data/update-status/Raspi2png
deleted file mode 100644
index a0f9a4b..0000000
--- a/data/update-status/Raspi2png
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/data/update-status/TBOPlayer b/data/update-status/TBOPlayer
deleted file mode 100644
index a0f9a4b..0000000
--- a/data/update-status/TBOPlayer
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/data/update-status/Windows 10 Theme b/data/update-status/Windows 10 Theme
deleted file mode 100644
index a0f9a4b..0000000
--- a/data/update-status/Windows 10 Theme	
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/update/pi-apps b/update/pi-apps
deleted file mode 160000
index d51045e..0000000
--- a/update/pi-apps
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d51045ef79db9abef2578e8c21c9eb9c49eb2057