diff --git a/Makefile b/Makefile
index 84be49b..ad6ccb2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 PREFIX    := /usr/local
 BINPREFIX := $(PREFIX)/bin
 
-SRC := $(wildcard *.c)
+SRC := $(wildcard src/*.c)
 OBJ := $(SRC:.c=.o)
 DEP := $(OBJ:.o=.d)
 PRE := $(wildcard prev/*.sh)
 GEN := gen/prev/scripts.h gen/server.h gen/helpers.h
 
-CFLAGS  += -Os -MD -Wall -Wextra -Wno-unused-parameter
+CFLAGS  += -I. -Os -MD -Wall -Wextra -Wno-unused-parameter
 LDFLAGS += -lmagic -lcrypto
 
 all: ctpv
@@ -32,8 +32,9 @@ make_embed:
 	$(MAKE) -C embed
 
 ctpv: $(OBJ)
+	$(CC) $(LDFLAGS) $+ -o $@
 
-ctpv.c: $(GEN)
+src/ctpv.c: $(GEN)
 
 gen/prev/scripts.h: $(PRE) embed/embed
 	@mkdir -p $(@D)
diff --git a/config.c b/src/config.c
similarity index 100%
rename from config.c
rename to src/config.c
diff --git a/config.h b/src/config.h
similarity index 100%
rename from config.h
rename to src/config.h
diff --git a/ctpv.c b/src/ctpv.c
similarity index 100%
rename from ctpv.c
rename to src/ctpv.c
diff --git a/ctpv.h b/src/ctpv.h
similarity index 100%
rename from ctpv.h
rename to src/ctpv.h
diff --git a/error.c b/src/error.c
similarity index 100%
rename from error.c
rename to src/error.c
diff --git a/error.h b/src/error.h
similarity index 100%
rename from error.h
rename to src/error.h
diff --git a/lexer.c b/src/lexer.c
similarity index 100%
rename from lexer.c
rename to src/lexer.c
diff --git a/lexer.h b/src/lexer.h
similarity index 100%
rename from lexer.h
rename to src/lexer.h
diff --git a/preview.c b/src/preview.c
similarity index 100%
rename from preview.c
rename to src/preview.c
diff --git a/preview.h b/src/preview.h
similarity index 100%
rename from preview.h
rename to src/preview.h
diff --git a/previews.h b/src/previews.h
similarity index 100%
rename from previews.h
rename to src/previews.h
diff --git a/server.c b/src/server.c
similarity index 100%
rename from server.c
rename to src/server.c
diff --git a/server.h b/src/server.h
similarity index 100%
rename from server.h
rename to src/server.h
diff --git a/shell.c b/src/shell.c
similarity index 100%
rename from shell.c
rename to src/shell.c
diff --git a/shell.h b/src/shell.h
similarity index 100%
rename from shell.h
rename to src/shell.h
diff --git a/utils.c b/src/utils.c
similarity index 100%
rename from utils.c
rename to src/utils.c
diff --git a/utils.h b/src/utils.h
similarity index 100%
rename from utils.h
rename to src/utils.h
diff --git a/vector.c b/src/vector.c
similarity index 100%
rename from vector.c
rename to src/vector.c
diff --git a/vector.h b/src/vector.h
similarity index 100%
rename from vector.h
rename to src/vector.h