diff --git a/analyze.py b/scripts/analyze.py
similarity index 98%
rename from analyze.py
rename to scripts/analyze.py
index c352054..7e39d85 100644
--- a/analyze.py
+++ b/scripts/analyze.py
@@ -34,7 +34,7 @@ def loadModel():
     print('LOADING TF LITE MODEL...', end=' ')
 
     # Load TFLite model and allocate tensors.
-    interpreter = tflite.Interpreter(model_path='model/BirdNET_6K_GLOBAL_MODEL.tflite',num_threads=2)
+    interpreter = tflite.Interpreter(model_path='../model/BirdNET_6K_GLOBAL_MODEL.tflite',num_threads=2)
     interpreter.allocate_tensors()
 
     # Get input and output tensors.
@@ -48,7 +48,7 @@ def loadModel():
 
     # Load labels
     CLASSES = []
-    with open('model/labels.txt', 'r') as lfile:
+    with open('../model/labels.txt', 'r') as lfile:
         for line in lfile.readlines():
             CLASSES.append(line.replace('\n', ''))
 
diff --git a/scripts/birdnet_analysis.sh b/scripts/birdnet_analysis.sh
index 9ea86c8..9bda1af 100755
--- a/scripts/birdnet_analysis.sh
+++ b/scripts/birdnet_analysis.sh
@@ -29,6 +29,8 @@ fi
 
 INCLUDE_LIST="/home/pi/BirdNET-Pi/include_species_list.txt"
 EXCLUDE_LIST="/home/pi/BirdNET-Pi/exclude_species_list.txt"
+[ -f ${INCLUDE_LIST} ] || touch ${INCLUDE_LIST}
+[ -f ${EXCLUDE_LIST} ] || touch ${EXCLUDE_LIST}
 if [ "$(du ${INCLUDE_LIST} | awk '{print $1}')" -lt 4 ];then
 	INCLUDE_LIST=null
 fi
@@ -87,9 +89,9 @@ run_analysis() {
     WEEK="$(echo "${WEEK_OF_YEAR} + 4" |bc -l)"
   fi
 
-  cd ${HOME}/BirdNET-Pi || exit 1
+  cd ${HOME}/BirdNET-Pi/scripts || exit 1
   for i in "${files[@]}";do
-    echo "${1}/${i}" > ./analyzing_now.txt
+    echo "${1}/${i}" > ../analyzing_now.txt
     [ -z ${RECORDING_LENGTH} ] && RECORDING_LENGTH=15
     [ ${RECORDING_LENGTH} == "60" ] && RECORDING_LENGTH=01:00
     FILE_LENGTH="$(ffmpeg -i ${1}/${i} 2>&1 | awk -F. '/Duration/ {print $1}' | cut -d':' -f3-4)"
diff --git a/scripts/createdb_bullseye.sh b/scripts/createdb_bullseye.sh
index e21c54f..fc920a1 100755
--- a/scripts/createdb_bullseye.sh
+++ b/scripts/createdb_bullseye.sh
@@ -39,7 +39,7 @@ GRANT ALL ON birds.* TO 'birder'@'localhost' IDENTIFIED BY '${DB_PWD}' WITH GRAN
 FLUSH PRIVILEGES;
 exit
 EOF
-sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/analyze.py
+sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/analyze.py
 sed -i "s/mysqli.default_host =.*/mysqli.default_host = localhost/g" /etc/php/7.4/fpm/php.ini
 sed -i "s/mysqli.default_user =.*/mysqli.default_user = birder/g" /etc/php/7.4/fpm/php.ini
 sed -i "s/mysqli.default_pw =.*/mysqli.default_pw = ${DB_PWD}/g" /etc/php/7.4/fpm/php.ini
diff --git a/scripts/createdb_buster.sh b/scripts/createdb_buster.sh
deleted file mode 100755
index 0ebcdb1..0000000
--- a/scripts/createdb_buster.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# This script performs the mysql_secure_installation
-# Creates the birds database
-# Creates the detections table
-# Creates the birder user and grants them appropriate
-# permissions
-# If using this script to re-initialize (DROP then CREATE)
-# the DB, be sure to run this as root or with sudo
-source /etc/birdnet/birdnet.conf
-DB_ROOT_PWD=staggerwontonpurporting
-mysql_secure_installation << EOF
-
-y
-${DB_ROOT_PWD}
-${DB_ROOT_PWD}
-y
-y
-y
-EOF
-
-mysql << EOF
-DROP DATABASE IF EXISTS birds;
-CREATE DATABASE IF NOT EXISTS birds;
-
-USE birds;
-
-CREATE TABLE IF NOT EXISTS detections (
-  Date DATE,
-  Time TIME,
-  Sci_Name VARCHAR(100) NOT NULL,
-  Com_Name VARCHAR(100) NOT NULL,
-  Confidence FLOAT,
-  Lat FLOAT,
-  Lon FLOAT,
-  Cutoff FLOAT,
-  Week INT,
-  Sens FLOAT,
-  Overlap FLOAT);
-GRANT ALL ON birds.* TO 'birder'@'localhost' IDENTIFIED BY '${DB_PWD}' WITH GRANT OPTION;
-FLUSH PRIVILEGES;
-exit
-EOF
-sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/analyze.py
-sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewdb.php
-sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewday.php
-sudo -u${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/overview.php
diff --git a/scripts/update_db_pwd.sh b/scripts/update_db_pwd.sh
index dae2656..9b68f13 100755
--- a/scripts/update_db_pwd.sh
+++ b/scripts/update_db_pwd.sh
@@ -5,7 +5,7 @@ source /etc/birdnet/birdnet.conf
 sudo mysql -e "
   SET PASSWORD FOR 'birder'@'localhost' = PASSWORD('${DB_PWD}');
   FLUSH PRIVILEGES";
-git -C /home/pi/BirdNET-Pi checkout -f analyze.py
+git -C /home/pi/BirdNET-Pi checkout -f scripts/analyze.py
 git -C /home/pi/BirdNET-Pi checkout -f scripts/viewdb.php 
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/analyze.py
+sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/analyze.py
 sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewdb.php
diff --git a/scripts/update_db_pwd_bullseye.sh b/scripts/update_db_pwd_bullseye.sh
index 2f0c80f..d0bfccc 100755
--- a/scripts/update_db_pwd_bullseye.sh
+++ b/scripts/update_db_pwd_bullseye.sh
@@ -5,9 +5,9 @@ source /etc/birdnet/birdnet.conf
 mysql -e "
   SET PASSWORD FOR 'birder'@'localhost' = PASSWORD('${DB_PWD}');
   FLUSH PRIVILEGES";
-sudo -u ${USER} git -C /home/pi/BirdNET-Pi checkout -f analyze.py
+sudo -u ${USER} git -C /home/pi/BirdNET-Pi checkout -f scripts/analyze.py
 sudo -u ${USER} git -C /home/pi/BirdNET-Pi checkout -f scripts/viewdb.php 
-sudo -u ${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/analyze.py
+sudo -u ${USER} sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/analyze.py
 sed -i "s/mysqli.default_host =.*/mysqli.default_host = localhost/g" /etc/php/7.4/fpm/php.ini
 sed -i "s/mysqli.default_user =.*/mysqli.default_user = birder/g" /etc/php/7.4/fpm/php.ini
 sed -i "s/mysqli.default_pw =.*/mysqli.default_pw = ${DB_PWD}/g" /etc/php/7.4/fpm/php.ini
diff --git a/scripts/update_db_pwd_buster.sh b/scripts/update_db_pwd_buster.sh
deleted file mode 100755
index e26a377..0000000
--- a/scripts/update_db_pwd_buster.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-# Update database password
-source /etc/birdnet/birdnet.conf
-
-sudo mysql -e "
-  UPDATE mysql.user 
-  SET Password=PASSWORD('${DB_PWD}') 
-  WHERE USER='birder' 
-  AND Host='localhost';
-  FLUSH PRIVILEGES";
-git -C /home/pi/BirdNET-Pi checkout -f analyze.py
-git -C /home/pi/BirdNET-Pi checkout -f scripts/viewdb.php 
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/analyze.py
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewdb.php
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/overview.php
-sed -i "s/databasepassword/${DB_PWD}/g" /home/pi/BirdNET-Pi/scripts/viewday.php