diff --git a/apt_query b/apt_query
new file mode 100755
index 0000000..01abc29
Binary files /dev/null and b/apt_query differ
diff --git a/lib.sh b/lib.sh
index 768f9ba..6531cc2 100755
--- a/lib.sh
+++ b/lib.sh
@@ -103,7 +103,7 @@ function get_normalized_package_list {
     | sed 's/[,\]/ /g; s/\s\+/ /g; s/^\s\+//g; s/\s\+$//g' \
     | sort -t' ')
   local script_dir="$(dirname -- "$(realpath -- "${0}")")"
-  go run ${script_dir}/apt_query.go normalized-list ${packages}
+  ${script_dir}/apt_query normalized-list ${packages}
 }
 
 ###############################################################################
diff --git a/apt_query.go b/src/cmd/apt_query/main.go
similarity index 100%
rename from apt_query.go
rename to src/cmd/apt_query/main.go
diff --git a/apt_query_test.go b/src/cmd/apt_query/main_test.go
similarity index 100%
rename from apt_query_test.go
rename to src/cmd/apt_query/main_test.go