improve GApps removal in system mode (for easier restoration upon uninstallation)

Full/nanodroid-functions

@@ -250,18 +250,26 @@ backup_nlpconflicts () {
 			case ${MODE} in
 				SYSTEM )
 					if [ -d "/system/priv-app/${app}" ]; then
-						mkdir -p /sdcard/nanodroid_backups/
-						mv /system/priv-app/${app} /sdcard/nanodroid_backups/
+						mkdir -p /sdcard/nanodroid_backups/priv-app/
+						mv /system/priv-app/${app} /sdcard/nanodroid_backups/priv-app/
 
 						ui_print " "
-						ui_print " ++ Moving ${app} to /sdcard/nanodroid_backups"
+						ui_print " ++ Moving ${app} to /sdcard/nanodroid_backups/"
+						ui_print " ++ it conflicts with microG location backends"
+						ui_print " "
+					elif [ -d "/system/app/${app}" ]; then
+						mkdir -p /sdcard/nanodroid_backups/app/
+						mv /system/app/${app} /sdcard/nanodroid_backups/app/
+
+						ui_print " "
+						ui_print " ++ Moving ${app} to /sdcard/nanodroid_backups/"
 						ui_print " ++ it conflicts with microG location backends"
 						ui_print " "
 					fi
 				;;
 
 				MAGISK )
-					if [ -d "/system/priv-app/${app}" ]; then
+					if [ -d "/system/priv-app/${app}" -o -d "/system/app/${app}" ]; then
 						ui_print " "
 						ui_print " ++ Creating overlay for ${app}"
 						ui_print " ++ it conflicts with microG location backends"