diff --git a/Makefile b/Makefile
deleted file mode 100644
index 192a0d1..0000000
--- a/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-kilo: fn.c terminal.c
-	$(CC) fn.c terminal.c output.c row.c hl.c search.c file.c input.c -o fn \
-		-Wall \
-		-Wextra \
-		-Wbad-function-cast \
-		-Wcast-align \
-		-Wcast-qual \
-		-Wmissing-declarations \
-		-Wnested-externs \
-		-Wpointer-arith \
-		-Wwrite-strings \
-	  -Wno-discarded-qualifiers \
-		-pedantic \
-		-std=c99
diff --git a/README b/README
new file mode 100644
index 0000000..9bc41bb
--- /dev/null
+++ b/README
@@ -0,0 +1,31 @@
+# FuNote
+
+This is a sinple (mostly) POSIX complaint terminal text editor, which
+should be working on all common (and not so common) VT100 compatible
+terminal emulators.
+
+## Features
+
+* Load/Save/create text files
+* Common keyboard controls
+* Search
+* Syntax Highlighting
+
+## Compile
+
+    $ cd src
+    $ make
+    $ ./fn
+
+## TODO
+
+* ISO8859-15 or UTF-8 files and input
+* Line numbers
+* Soft wrap lines
+* Add a .fnrc file to store/read configuration
+
+## Author
+
+Aaron Fischer (<mail@aaron-fischer.net>)
+https://aaron-fischer.net/
+
diff --git a/fn b/fn
deleted file mode 100755
index 82c13dc..0000000
Binary files a/fn and /dev/null differ
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..fc2c4ff
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,19 @@
+CFLAGS = -Wall \
+		     -Wextra \
+		     -Wbad-function-cast \
+		     -Wcast-align \
+		     -Wcast-qual \
+		     -Wmissing-declarations \
+		     -Wnested-externs \
+		     -Wpointer-arith \
+		     -Wwrite-strings \
+	       -Wno-discarded-qualifiers \
+		     -pedantic \
+		     -std=c99
+SRC=$(wildcard *.c)
+
+clean:
+	rm -f fn
+
+fn: $(SRC)
+	$(CC) -o $@ $^ $(CFLAGS)
diff --git a/file.c b/src/file.c
similarity index 100%
rename from file.c
rename to src/file.c
diff --git a/file.h b/src/file.h
similarity index 100%
rename from file.h
rename to src/file.h
diff --git a/fn.c b/src/fn.c
similarity index 100%
rename from fn.c
rename to src/fn.c
diff --git a/fn.h b/src/fn.h
similarity index 100%
rename from fn.h
rename to src/fn.h
diff --git a/hl.c b/src/hl.c
similarity index 100%
rename from hl.c
rename to src/hl.c
diff --git a/hl.h b/src/hl.h
similarity index 100%
rename from hl.h
rename to src/hl.h
diff --git a/input.c b/src/input.c
similarity index 100%
rename from input.c
rename to src/input.c
diff --git a/input.h b/src/input.h
similarity index 100%
rename from input.h
rename to src/input.h
diff --git a/output.c b/src/output.c
similarity index 100%
rename from output.c
rename to src/output.c
diff --git a/output.h b/src/output.h
similarity index 100%
rename from output.h
rename to src/output.h
diff --git a/row.c b/src/row.c
similarity index 100%
rename from row.c
rename to src/row.c
diff --git a/row.h b/src/row.h
similarity index 100%
rename from row.h
rename to src/row.h
diff --git a/search.c b/src/search.c
similarity index 100%
rename from search.c
rename to src/search.c
diff --git a/search.h b/src/search.h
similarity index 100%
rename from search.h
rename to src/search.h
diff --git a/terminal.c b/src/terminal.c
similarity index 100%
rename from terminal.c
rename to src/terminal.c
diff --git a/terminal.h b/src/terminal.h
similarity index 100%
rename from terminal.h
rename to src/terminal.h