diff --git a/Makefile b/Makefile
index a23a8cf..a71867e 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,8 @@ all: main
 	$(CXX) $(ARCH) $(CXXSTD) $(CFLAGS) $(OPT) $(DEBUG) -c $< -o $@
 
 PACK_FILENAMES = $(shell cat filenames.txt)
-test.pack: pack_main $(PACK_FILENAMES)
-	./pack_main $@ $(PACK_FILENAMES)
+test.pack: tool/pack_file $(PACK_FILENAMES)
+	./tool/pack_file $@ $(PACK_FILENAMES)
 
 test.pack.o: test.pack
 	$(OBJCOPY) -I binary -O $(OBJARCH) $< $@
diff --git a/tool/Makefile b/tool/Makefile
index 88eee64..0235b0f 100644
--- a/tool/Makefile
+++ b/tool/Makefile
@@ -1,5 +1,9 @@
 OPT = -O2
 CFLAGS = -I../../opus-dist/include
+CFLAGS = -I../include
 
 opus_encode: opus_encode.c ../../opus-dist/lib/libopus.a
 	gcc -o $@ $(OPT) $(CFLAGS) -lm $^
+
+pack_file: pack_file.cpp
+	g++ -o $@ $(OPT) $(CFLAGS) $^
diff --git a/tool/pack_file b/tool/pack_file
new file mode 100755
index 0000000..e1389e3
Binary files /dev/null and b/tool/pack_file differ
diff --git a/src/pack_main.cpp b/tool/pack_file.cpp
similarity index 100%
rename from src/pack_main.cpp
rename to tool/pack_file.cpp