diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bd31a53
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+*
+
+!.gitignore
+!Makefile
+!**/
+
+*.o
+*.a
+.cproject
+.project
+.settings/language.settings.xml
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..c872899
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,28 @@
+CC = gcc
+CFLAGS = -O0 -I include 
+
+ifdef DEBUG
+CFLAGS += -g3
+endif
+
+LFLAGS = -lmultiaddr
+DEPS = include/multiaddr/base58.h include/multiaddr/endian.h include/multiaddr/multiaddr.h \
+	include/multiaddr/protocols.h include/multiaddr/protoutils.h include/multiaddr/varhexutils.h \
+	include/multiaddr/varint.h
+OBJS = base58.o varint.o
+
+%.o: %.c $(DEPS)
+	$(CC) -c -o $@ $< $(CFLAGS)
+
+libmultiaddr.a: $(OBJS)
+	ar rcs $@ $^
+
+test_multiaddr: libmultiaddr.a testing.o
+	$(CC) -o $@ $^ $(LFLAGS)
+
+all: test_multiaddr
+
+clean:
+	rm -f *.o
+	rm -f libmultiaddr.a
+	rm -f test_multiaddr
\ No newline at end of file
diff --git a/base58.h b/include/multiaddr/base58.h
similarity index 100%
rename from base58.h
rename to include/multiaddr/base58.h
diff --git a/endian.h b/include/multiaddr/endian.h
similarity index 100%
rename from endian.h
rename to include/multiaddr/endian.h
diff --git a/multiaddr.h b/include/multiaddr/multiaddr.h
similarity index 100%
rename from multiaddr.h
rename to include/multiaddr/multiaddr.h
diff --git a/protocols.h b/include/multiaddr/protocols.h
similarity index 100%
rename from protocols.h
rename to include/multiaddr/protocols.h
diff --git a/protoutils.h b/include/multiaddr/protoutils.h
similarity index 100%
rename from protoutils.h
rename to include/multiaddr/protoutils.h
diff --git a/varhexutils.h b/include/multiaddr/varhexutils.h
similarity index 100%
rename from varhexutils.h
rename to include/multiaddr/varhexutils.h
diff --git a/varint.h b/include/multiaddr/varint.h
similarity index 100%
rename from varint.h
rename to include/multiaddr/varint.h
diff --git a/testing.c b/testing.c
index f914c36..31c962c 100644
--- a/testing.c
+++ b/testing.c
@@ -1,4 +1,4 @@
-#include "multiaddr.h"
+#include "multiaddr/multiaddr.h"
 //ADD TO PROTOUTILS.H
 
 int main()
diff --git a/varint.c b/varint.c
index a8fd1cc..45d6b7c 100644
--- a/varint.c
+++ b/varint.c
@@ -1,8 +1,8 @@
-#include "varint.h"
+#include "multiaddr/varint.h"
 
 
 DEFN_ENCODER(32)
 DEFN_DECODER(32)
 
 DEFN_ENCODER(64)
-DEFN_DECODER(64)
\ No newline at end of file
+DEFN_DECODER(64)