diff --git a/bash_it.sh b/bash_it.sh
index 59c6ed8e..527c9f53 100755
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -51,15 +51,6 @@ for _bash_it_config_file in $LIB; do
 	fi
 done
 
-# Load vendors
-BASH_IT_LOG_PREFIX="vendor: "
-for _bash_it_vendor_init in "${BASH_IT}"/vendor/init.d/*.bash; do
-	_log_debug "Loading \"$(basename "${_bash_it_vendor_init}" .bash)\"..."
-	# shellcheck disable=SC1090
-	source "${_bash_it_vendor_init}"
-done
-unset _bash_it_vendor_init
-
 BASH_IT_LOG_PREFIX="core: main: "
 # Load the global "enabled" directory
 # "family" param is empty so that files get sources in glob order
diff --git a/clean_files.txt b/clean_files.txt
index f4ab4b19..1a6bac33 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -82,6 +82,7 @@ completion/available/wpscan.completion.bash
 # libraries
 lib/helpers.bash
 lib/log.bash
+lib/preexec.bash
 lib/utilities.bash
 
 # plugins
@@ -165,4 +166,3 @@ themes/purity
 # vendor init files
 #
 vendor/.gitattributes
-vendor/init.d
diff --git a/vendor/init.d/preexec.bash b/lib/preexec.bash
similarity index 89%
rename from vendor/init.d/preexec.bash
rename to lib/preexec.bash
index 6cfa7b0a..1035b11f 100644
--- a/vendor/init.d/preexec.bash
+++ b/lib/preexec.bash
@@ -8,7 +8,7 @@
 # Disable immediate `$PROMPT_COMMAND` modification
 __bp_delay_install="delayed"
 
-# shellcheck source-path=SCRIPTDIR/../github.com/rcaloras/bash-preexec
+# shellcheck source-path=SCRIPTDIR/../vendor/github.com/rcaloras/bash-preexec
 source "${BASH_IT?}/vendor/github.com/rcaloras/bash-preexec/bash-preexec.sh"
 
 # Block damanaging user's `$HISTCONTROL`
diff --git a/test/plugins/cmd-returned-notify.plugin.bats b/test/plugins/cmd-returned-notify.plugin.bats
old mode 100644
new mode 100755
index daf58330..6f3cf25a
--- a/test/plugins/cmd-returned-notify.plugin.bats
+++ b/test/plugins/cmd-returned-notify.plugin.bats
@@ -2,7 +2,6 @@
 
 load ../test_helper
 load ../test_helper_libs
-load ../../vendor/init.d/preexec
 
 load ../../plugins/available/cmd-returned-notify.plugin
 
diff --git a/test/test_helper_libs.bash b/test/test_helper_libs.bash
index 57115e7e..cc585fad 100644
--- a/test/test_helper_libs.bash
+++ b/test/test_helper_libs.bash
@@ -4,3 +4,4 @@ load "${BASH_IT}/lib/log.bash"
 load "${BASH_IT}/lib/utilities.bash"
 load "${BASH_IT}/lib/helpers.bash"
 load "${BASH_IT}/lib/search.bash"
+load "${BASH_IT}/lib/preexec.bash"