diff --git a/lib/build.sh b/lib/build.sh
index 7be6083..d24fc11 100644
--- a/lib/build.sh
+++ b/lib/build.sh
@@ -159,7 +159,7 @@ set_compile_opts() {
 
 	# make sure RUSTUP_HOME and CARGO_HOME are defined
 	RUSTUP_HOME="${RUSTUP_HOME:-"${HOME}/.rustup"}"
-	CARGO_HOME="${CARGO_HOME:-"${HOME}/.rustup"}"
+	CARGO_HOME="${CARGO_HOME:-"${HOME}/.cargo"}"
 	test -d "${RUSTUP_HOME}" || echo_exit "RUSTUP_HOME does not exist"
 	test -d "${CARGO_HOME}" || echo_exit "CARGO_HOME does not exist"
 	export RUSTUP_HOME CARGO_HOME
diff --git a/lib/encode.sh b/lib/encode.sh
index b8f5442..16161e3 100644
--- a/lib/encode.sh
+++ b/lib/encode.sh
@@ -1,97 +1,5 @@
 #!/usr/bin/env bash
 
-get_duration() {
-	local file="$1"
-	ffprobe \
-		-v error \
-		-show_entries format=duration \
-		-of default=noprint_wrappers=1:nokey=1 \
-		"${file}"
-}
-
-get_crop() {
-	local file="$1"
-	local duration
-	duration="$(get_duration "${file}")" || return 1
-	# don't care about decimal points
-	IFS='.' read -r duration _ <<<"${duration}"
-	# get crop value for first half of input
-	local timeEnc=$((duration / 2))
-	ffmpeg \
-		-y \
-		-hide_banner \
-		-ss 0 \
-		-discard 'nokey' \
-		-i "${file}" \
-		-t "${timeEnc}" \
-		-map '0:v:0' \
-		-filter:v:0 'cropdetect=limit=100:round=16:skip=2:reset_count=0' \
-		-codec:v 'wrapped_avframe' \
-		-f 'null' '/dev/null' 2>&1 |
-		grep -o crop=.* |
-		sort -bh |
-		uniq -c |
-		sort -bh |
-		tail -n1 |
-		grep -o "crop=.*"
-}
-
-get_stream_codec() {
-	local file="$1"
-	local stream="$2"
-	ffprobe \
-		-v error \
-		-select_streams "${stream}" \
-		-show_entries stream=codec_name \
-		-of default=noprint_wrappers=1:nokey=1 \
-		"${file}"
-}
-
-get_file_format() {
-	local file="$1"
-	local probe
-	probe="$(ffprobe \
-		-v error \
-		-show_entries format=format_name \
-		-of default=noprint_wrappers=1:nokey=1 \
-		"${file}")" || return 1
-	if line_contains "${probe}" 'matroska'; then
-		echo mkv
-	else
-		echo mp4
-	fi
-}
-
-get_num_streams() {
-	local file="$1"
-	ffprobe \
-		-v error \
-		-show_entries stream=index \
-		-of default=noprint_wrappers=1:nokey=1 \
-		"${file}"
-}
-
-get_num_audio_streams() {
-	local file="$1"
-	ffprobe \
-		-v error \
-		-select_streams a \
-		-show_entries stream=index \
-		-of default=noprint_wrappers=1:nokey=1 \
-		"${file}"
-}
-
-get_num_audio_channels() {
-	local file="$1"
-	local stream="$2"
-	ffprobe \
-		-v error \
-		-select_streams "${stream}" \
-		-show_entries stream=channels \
-		-of default=noprint_wrappers=1:nokey=1 \
-		"${file}"
-}
-
 unmap_streams() {
 	local file="$1"
 	local unmapFilter='bin_data|jpeg|png'
@@ -187,16 +95,16 @@ audio_enc_version() {
 }
 
 encode_usage() {
-	echo "$(bash_basename "$0") -i input_file [options] "
+	echo "$(bash_basename "$0") -i input [options] output"
 	echo -e "\t[-P NUM] set preset (default: ${PRESET})"
 	echo -e "\t[-C NUM] set CRF (default: ${CRF})"
+	echo -e "\t[-g NUM] set film grain for encode"
 	echo -e "\t[-p] print the command instead of executing it (default: ${PRINT_OUT})"
 	echo -e "\t[-c] use cropdetect (default: ${CROP})"
 	echo -e "\t[-d] disable dolby vision (default: ${DISABLE_DV})"
 	echo -e "\t[-v] Print relevant version info"
-	echo -e "\t[-g NUM] set film grain for encode"
 	echo -e "\t[-s] use same container as input, default is mkv"
-	echo -e "\n\t[output_file] if unset, defaults to ${HOME}/"
+	echo -e "\n\t[output] if unset, defaults to ${HOME}/"
 	echo -e "\n\t[-I] Install this as /usr/local/bin/encode"
 	echo -e "\t[-U] Uninstall this from /usr/local/bin/encode"
 	return 0
diff --git a/lib/ffmpeg.sh b/lib/ffmpeg.sh
new file mode 100644
index 0000000..74b1e5c
--- /dev/null
+++ b/lib/ffmpeg.sh
@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+
+get_duration() {
+	local file="$1"
+	ffprobe \
+		-v error \
+		-show_entries format=duration \
+		-of default=noprint_wrappers=1:nokey=1 \
+		"${file}"
+}
+
+get_crop() {
+	local file="$1"
+	local duration
+	duration="$(get_duration "${file}")" || return 1
+	# don't care about decimal points
+	IFS='.' read -r duration _ <<<"${duration}"
+	# get crop value for first half of input
+	local timeEnc=$((duration / 2))
+	ffmpeg \
+		-y \
+		-hide_banner \
+		-ss 0 \
+		-discard 'nokey' \
+		-i "${file}" \
+		-t "${timeEnc}" \
+		-map '0:v:0' \
+		-filter:v:0 'cropdetect=limit=100:round=16:skip=2:reset_count=0' \
+		-codec:v 'wrapped_avframe' \
+		-f 'null' '/dev/null' 2>&1 |
+		grep -o crop=.* |
+		sort -bh |
+		uniq -c |
+		sort -bh |
+		tail -n1 |
+		grep -o "crop=.*"
+}
+
+get_stream_codec() {
+	local file="$1"
+	local stream="$2"
+	ffprobe \
+		-v error \
+		-select_streams "${stream}" \
+		-show_entries stream=codec_name \
+		-of default=noprint_wrappers=1:nokey=1 \
+		"${file}"
+}
+
+get_file_format() {
+	local file="$1"
+	local probe
+	probe="$(ffprobe \
+		-v error \
+		-show_entries format=format_name \
+		-of default=noprint_wrappers=1:nokey=1 \
+		"${file}")" || return 1
+	if line_contains "${probe}" 'matroska'; then
+		echo mkv
+	else
+		echo mp4
+	fi
+}
+
+get_num_streams() {
+	local file="$1"
+	ffprobe \
+		-v error \
+		-show_entries stream=index \
+		-of default=noprint_wrappers=1:nokey=1 \
+		"${file}"
+}
+
+get_num_audio_streams() {
+	local file="$1"
+	ffprobe \
+		-v error \
+		-select_streams a \
+		-show_entries stream=index \
+		-of default=noprint_wrappers=1:nokey=1 \
+		"${file}"
+}
+
+get_num_audio_channels() {
+	local file="$1"
+	local stream="$2"
+	ffprobe \
+		-v error \
+		-select_streams "${stream}" \
+		-show_entries stream=channels \
+		-of default=noprint_wrappers=1:nokey=1 \
+		"${file}"
+}
diff --git a/lib/install_deps.sh b/lib/install_deps.sh
index a8beff2..b6d1624 100644
--- a/lib/install_deps.sh
+++ b/lib/install_deps.sh
@@ -50,7 +50,7 @@ print_req_pkgs() {
 	# shellcheck disable=SC2034
 	local brew_pkgs=(
 		"${common_pkgs[@]}" pkgconf
-		mkvtoolnix pipx
+		mkvtoolnix pipx uutils-coreutils
 	)
 	local common_linux_pkgs=(
 		"${common_pkgs[@]}" clang valgrind
@@ -79,6 +79,17 @@ print_req_pkgs() {
 		cpuinfo-devel glibc-static glibc-devel
 		libstdc++-static libstdc++-devel patch
 	)
+	# shellcheck disable=SC2034
+	local android_pkgs=(
+		autoconf automake cmake libtool
+		texinfo nasm yasm python3 wget
+		doxygen jq ccache gawk rust
+		git gnuplot bison rsync ragel
+		zip unzip gperf build-essential
+		binutils
+	)
+	# pip install pipx
+	# pipx install virtualenv
 
 	local req_pkgs_env_name="${pkg_mgr/-/_}_pkgs"
 	declare -n req_pkgs="${req_pkgs_env_name}"
diff --git a/lib/common.sh b/lib/utils.sh
similarity index 100%
rename from lib/common.sh
rename to lib/utils.sh