diff --git a/.gitignore b/.gitignore
index d3e7dbe..422eef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@ src/lex.c
 
 # Binaries
 src/*.o
+src/b64/*.o
 src/*.a
 src/bip
 src/bipmkpw
diff --git a/src/Makefile.am b/src/Makefile.am
index 57b8992..fabd767 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ libbip_a_SOURCES = \
 	path_util.c path_util.h \
 	tuple.h \
 	util.c util.h \
-	utils/base64.c utils/base64.h
+	b64/base64.c b64/base64.h
 
 libbip_a_CFLAGS = ${OPENSSL_CFLAGS} $(AM_CFLAGS)
 
diff --git a/src/utils/base64.c b/src/b64/base64.c
similarity index 100%
rename from src/utils/base64.c
rename to src/b64/base64.c
diff --git a/src/utils/base64.h b/src/b64/base64.h
similarity index 100%
rename from src/utils/base64.h
rename to src/b64/base64.h
diff --git a/src/irc.c b/src/irc.c
index e31e9af..82ed6d1 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -22,7 +22,7 @@
 #include "log.h"
 #include "connection.h"
 #include "md5.h"
-#include "utils/base64.h"
+#include "b64/base64.h"
 
 // TODO resolve assuming signed overflow does not occur when changing X +- C1
 // cmp C2 to X cmp C2 -+ C1