diff --git a/src/Makefile.am b/src/Makefile.am
index 57b8992..cb6ae0d 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
+	utils/b64/base64.c utils/b64/base64.h
 
 libbip_a_CFLAGS = ${OPENSSL_CFLAGS} $(AM_CFLAGS)
 
diff --git a/src/irc.c b/src/irc.c
index 2cf1075..8dd0b0e 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 "utils/b64/base64.h"
 
 // TODO resolve assuming signed overflow does not occur when changing X +- C1
 // cmp C2 to X cmp C2 -+ C1
diff --git a/src/utils/base64.c b/src/utils/b64/base64.c
similarity index 100%
rename from src/utils/base64.c
rename to src/utils/b64/base64.c
diff --git a/src/utils/base64.h b/src/utils/b64/base64.h
similarity index 100%
rename from src/utils/base64.h
rename to src/utils/b64/base64.h
diff --git a/src/utils/includes.h b/src/utils/b64/includes.h
similarity index 100%
rename from src/utils/includes.h
rename to src/utils/b64/includes.h
diff --git a/src/utils/os.h b/src/utils/b64/os.h
similarity index 100%
rename from src/utils/os.h
rename to src/utils/b64/os.h
diff --git a/src/utils/utils/common.h b/src/utils/b64/utils/common.h
similarity index 100%
rename from src/utils/utils/common.h
rename to src/utils/b64/utils/common.h