diff --git a/gnome/bin/setup b/gnome/bin/setup
index e11fda1..0e1d250 100755
--- a/gnome/bin/setup
+++ b/gnome/bin/setup
@@ -137,8 +137,8 @@ sed -i -e "s/{bin_dir}/$ESCAPED_XDG_BIN_HOME/g" \
 cp bin/breezy_gnome_verify $XDG_BIN_HOME
 
 echo "Copying the manifest file to ${BREEZY_GNOME_DATA_DIR}"
-mkdir -p $BREEZY_GNOME_DATA_DIR
-cp manifest $BREEZY_GNOME_DATA_DIR
+mkdir -p "$BREEZY_GNOME_DATA_DIR"
+cp manifest "$BREEZY_GNOME_DATA_DIR/manifest"
 
 echo "Installing the breezydesktop@xronlinux.com GNOME extension"
 gnome-extensions install --force breezydesktop@xronlinux.com.shell-extension.zip
diff --git a/vulkan/bin/setup b/vulkan/bin/setup
index 6504d83..26a05f6 100755
--- a/vulkan/bin/setup
+++ b/vulkan/bin/setup
@@ -14,9 +14,6 @@ if [ -z "$XDG_DATA_HOME" ]; then
   XDG_DATA_HOME="$USER_HOME/.local/share"
 fi
 DATA_DIR="$XDG_DATA_HOME/breezy_vulkan"
-if [ ! -d "$DATA_DIR" ]; then
-  mkdir -p $DATA_DIR
-fi
 VULKAN_DATA_DIR="$XDG_DATA_HOME/vulkan"
 XR_DRIVER_DATA_DIR="$XDG_DATA_HOME/xr_driver"
 
@@ -35,27 +32,15 @@ if [ -z "$XDG_BIN_HOME" ]; then
 fi
 OLD_BIN_DIR="$USER_HOME/bin"
 BIN_DIR="$XDG_BIN_HOME"
-if [ ! -d "$BIN_DIR" ]; then
-  mkdir -p $BIN_DIR
-fi
 
 if [ -z "$XDG_STATE_HOME" ]; then
   XDG_STATE_HOME="$USER_HOME/.local/state"
 fi
 STATE_DIR="$XDG_STATE_HOME/breezy_vulkan"
-if [ ! -d "$STATE_DIR" ]; then
-  mkdir -p $STATE_DIR
-fi
 
 LIB_DIR="$USER_HOME/.local/lib"
-if [ ! -d "$LIB_DIR" ]; then
-  mkdir -p "$LIB_DIR"
-fi
 
 LIB32_DIR="$USER_HOME/.local/lib32"
-if [ ! -d "$LIB32_DIR" ]; then
-  mkdir -p "$LIB32_DIR"
-fi
 
 if [ -e "$USER_HOME/bin/breezy_vulkan_uninstall" ]; then
   echo "Cleaning up the previous installation"
@@ -90,6 +75,7 @@ ESCAPED_DATA_DIR=$(printf '%s\n' "$DATA_DIR" | sed -e 's/[\/&]/\\&/g')
 ESCAPED_XR_DRIVER_DATA_DIR=$(printf '%s\n' "$XR_DRIVER_DATA_DIR" | sed -e 's/[\/&]/\\&/g')
 
 echo "Copying the breezy_vulkan scripts to ${BIN_DIR} and related files to ${DATA_DIR}"
+mkdir -p "$BIN_DIR"
 cp bin/breezy_vulkan_uninstall $BIN_DIR
 cp bin/breezy_vulkan_logs $BIN_DIR
 sed -i -e "s/{bin_dir}/$ESCAPED_BIN_DIR/g" \
@@ -101,7 +87,8 @@ sed -i -e "s/{bin_dir}/$ESCAPED_BIN_DIR/g" \
        -e "s/{xr_driver_data_dir}/$ESCAPED_XR_DRIVER_DATA_DIR/g" \
           bin/breezy_vulkan_verify
 cp bin/breezy_vulkan_verify $BIN_DIR
-cp manifest $DATA_DIR
+mkdir -p "$DATA_DIR"
+cp manifest "$DATA_DIR/manifest"
 
 # keep putting this in the old location in case an older version of the script tries to find it
 if [ ! -d "$OLD_BIN_DIR" ]; then
@@ -115,6 +102,8 @@ echo "Installing vkBasalt; copying binaries, configs, and shader files"
 # copy the vkBasalt binaries and configs
 mkdir -p "$VULKAN_DATA_DIR"/implicit_layer.d
 mkdir -p "$XDG_CONFIG_HOME"/{vkBasalt,reshade/Shaders,reshade/Textures}
+mkdir -p "$LIB_DIR"
+mkdir -p "$LIB32_DIR"
 cp vkBasalt.64/libvkbasalt.so $LIB_DIR/
 cp vkBasalt.32/libvkbasalt.so $LIB32_DIR/
 
@@ -143,6 +132,8 @@ cp *.frag $GAMESCOPE_RESHADE_SHADERS_DIR
 cp *.fx* $GAMESCOPE_RESHADE_SHADERS_DIR
 cp *.png $GAMESCOPE_RESHADE_TEXTURES_DIR
 
+mkdir -p "$STATE_DIR"
+
 chown -R $USER:$GROUP $LIB_DIR
 chown -R $USER:$GROUP $LIB32_DIR
 chown -R $USER:$GROUP $DATA_DIR