diff --git a/src/util/containers.c b/src/util/containers.c
new file mode 100644
index 0000000..0853c23
--- /dev/null
+++ b/src/util/containers.c
@@ -0,0 +1 @@
+#include "containers.h"
diff --git a/src/util/containers.h b/src/util/containers.h
new file mode 100644
index 0000000..bbdde58
--- /dev/null
+++ b/src/util/containers.h
@@ -0,0 +1,10 @@
+#ifndef GLV_UTIL_CONTAINERS_H
+#define GLV_UTIL_CONTAINERS_H
+
+typedef struct {
+
+} glv_map_t;
+
+glv_map_t* glv_map_create();
+
+#endif
diff --git a/src/util/string.c b/src/util/etc.c
similarity index 93%
rename from src/util/string.c
rename to src/util/etc.c
index dd59321..28ec62c 100644
--- a/src/util/string.c
+++ b/src/util/etc.c
@@ -1,4 +1,5 @@
-#include "string.h"
+#include "etc.h"
+#include <string.h>
 
 int axtoi(const char* str) {
     int value = 0, i;
diff --git a/src/util/string.h b/src/util/etc.h
similarity index 57%
rename from src/util/string.h
rename to src/util/etc.h
index 0b35562..003d89e 100644
--- a/src/util/string.h
+++ b/src/util/etc.h
@@ -1,8 +1,10 @@
 #ifndef GLV_UTIL_STRING_H
 #define GLV_UTIL_STRING_H
 
-#include <string.h>
+#define MAX(X,Y) (((X)>(Y))?(X):(Y))
+#define MIN(X,Y) (((X)<(Y))?(X):(Y))
 
+// AUX STRING FUNCS
 int axtoi(const char* str);
 int strcnt(const char* str, char c);
 
diff --git a/src/util/ini.c b/src/util/ini.c
index 7710f9b..a6420b1 100644
--- a/src/util/ini.c
+++ b/src/util/ini.c
@@ -1,5 +1,2 @@
-//
-// Created by alec on 2/7/2019.
-//
-
 #include "ini.h"
+
diff --git a/src/util/ini.h b/src/util/ini.h
index b1bebfa..e2c5681 100644
--- a/src/util/ini.h
+++ b/src/util/ini.h
@@ -1,6 +1,8 @@
 #ifndef GLV_UTIL_INI_H
 #define GLV_UTIL_INI_H
 
+typedef struct {
 
+} glv_ini_t;
 
 #endif
diff --git a/src/util/ipaddr.c b/src/util/ipaddr.c
index 6abcd55..62a888f 100644
--- a/src/util/ipaddr.c
+++ b/src/util/ipaddr.c
@@ -1,8 +1,5 @@
 #include "ipaddr.h"
 
-#define MAX(X,Y) (((X)>(Y))?(X):(Y))
-#define MIN(X,Y) (((X)<(Y))?(X):(Y))
-
 const ipaddr_t error_addr = {{0, 0, 0, 0, 0, 0, 0, 0}, -1};
 
 ipaddr_t glv_ip_aton(const char* addr) {
diff --git a/src/util/ipaddr.h b/src/util/ipaddr.h
index efd5e34..deb52d8 100644
--- a/src/util/ipaddr.h
+++ b/src/util/ipaddr.h
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "util/string.h"
+#include "util/etc.h"
 
 typedef struct {
     uint16_t addr[8];