diff --git a/set1/Makefile b/set1/Makefile
index bda06dc..411a122 100644
--- a/set1/Makefile
+++ b/set1/Makefile
@@ -1,14 +1,19 @@
+CC      = gcc
+CFLAGS  = -Wall -Wpedantic -Wextra -std=c99
+DEBUG   = -g
+LINK    = 
+SRC_DIR = src
+OUT_DIR = bin
+TARGETS = base64
 
-CC = gcc
-CFLAGS = -Wall -Wpedantic -Wextra -std=c99 -g
-RM = rm
 
-all: base64
+all: $(TARGETS)
 
-base64: base64.c
-	$(CC) -o $@ $^
+%: $(SRC_DIR)/%.c
+	$(CC) $(CFLAGS) $(LINK) $< -o $(OUT_DIR)/$@
 
 clean:
-	$(RM) base64
-	$(RM) *.o
+	$(RM) *.o $(OUT_DIR)/*
+
+.PHONY: all clean
 
diff --git a/set1/base64.c b/set1/src/base64.c
similarity index 100%
rename from set1/base64.c
rename to set1/src/base64.c