diff --git a/src/editor.c b/src/editor.c
index 86b02a5..2350b51 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1,15 +1,93 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <ctype.h>
 
+#include "editor.h"
 #include "vip.h"
-#include "bar.h"
-#include "row.h"
 #include "term.h"
+#include "io.h"
+#include "bar.h"
 
 extern editor vip;
 
+void refresh_screen()
+{
+	scroll();
+
+	struct abuf ab = ABUF_INIT;
+
+	abAppend(&ab, "\x1b[?25l", 6);
+	abAppend(&ab, "\x1b[H", 3);
+
+	draw_rows(&ab);
+	draw_status_bar(&ab);
+	draw_message_bar(&ab);
+
+	char buf[32];
+	snprintf(buf, sizeof(buf), "\x1b[%d;%dH", (vip.cy - vip.rowoff) + 1,
+			(vip.rx - vip.coloff) + 1);
+	abAppend(&ab, buf, strlen(buf));
+
+	abAppend(&ab, "\x1b[?25h", 6);
+
+	write(STDOUT_FILENO, ab.b, ab.len);
+	abFree(&ab);
+}
+
+void move_cursor(int key)
+{
+	row *row = (vip.cy >= vip.rows) ? NULL : &vip.row[vip.cy];
+	switch (key) {
+		case ARROW_LEFT:
+			if (vip.cx != 0) {
+				vip.cx--;
+			}
+			break;
+		case ARROW_RIGHT:
+			if (row && vip.cx < row->size) {
+				vip.cx++;
+			}
+			break;
+		case ARROW_UP:
+			if (vip.cy != 0) {
+				vip.cy--;
+			}
+			break;
+		case ARROW_DOWN:
+			if (vip.cy < vip.rows) {
+				vip.cy++;
+			}
+			break;
+	}
+	row = (vip.cy >= vip.rows) ? NULL : &vip.row[vip.cy];
+	int rowlen = row ? row->size : 0;
+	if (vip.cx > rowlen) {
+		vip.cx = rowlen;
+	}
+}
+
+void scroll()
+{
+	vip.rx = 0;
+	if (vip.cy < vip.rows) {
+		vip.rx = row_cx_to_rx(&vip.row[vip.cy], vip.cx);
+	}
+	if (vip.cy < vip.rowoff) {
+		vip.rowoff = vip.cy;
+	}
+	if (vip.cy >= vip.rowoff + vip.screenrows) {
+		vip.rowoff = vip.cy - vip.screenrows + 1;
+	}
+	if (vip.rx < vip.coloff) {
+		vip.coloff = vip.rx;
+	}
+	if (vip.rx >= vip.coloff + vip.screencols) {
+		vip.coloff = vip.rx - vip.screencols + 1;
+	}
+}
+
 void insert_char(int c)
 {
 	if (vip.cy == vip.rows) {
@@ -62,10 +140,35 @@ void del_char()
 	}
 }
 
+void init_editor()
+{
+	vip.cx = 0;
+	vip.cy = 0;
+	vip.rx = 0;
+	vip.rowoff = 0;
+	vip.coloff = 0;
+	vip.rows = 0;
+	vip.row = NULL;
+	vip.dirty = 0;
+	vip.mode = NORMAL;
+	vip.filename = NULL;
+	vip.statusmsg[0] = '\0';
+	vip.statusmsg_time = 0;
+	vip.syntax = NULL;
+
+	if (get_window_size(&vip.screenrows, &vip.screencols) == -1) {
+		die("get_window_size");
+	}
+	vip.screenrows -= 2;
+}
+
 void open_editor(char *filename)
 {
 	free(vip.filename);
 	vip.filename = strdup(filename);
+
+	select_syntax_highlight();
+
 	FILE *fp = fopen(filename, "r");
 	if (!fp) {
 		die("fopen");
@@ -170,8 +273,8 @@ void find_callback(char *query, int key)
 			saved_hl = malloc(row->render_size);
 			memcpy(saved_hl, row->hl, row->render_size);
 
-			memset(&row->hl[match - row->render], HL_MATCH, strlen(query));
-			memset(&row->hl[match - row->render + strlen(query)], HL_RESET, row->render_size - (match - row->render + strlen(query)));
+			memset(&row->hl[match - row->render], MATCH, strlen(query));
+			memset(&row->hl[match - row->render + strlen(query)], RESET, row->render_size - (match - row->render + strlen(query)));
 			break;
 		}
 	}
diff --git a/src/vip.c b/src/vip.c
index 1c26b93..aca187b 100644
--- a/src/vip.c
+++ b/src/vip.c
@@ -2,105 +2,18 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <termios.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
 #include "vip.h"
 #include "term.h"
-#include "bar.h"
 #include "editor.h"
-#include "row.h"
-#include "syntax.h"
+#include "bar.h"
+#include "io.h"
 
 editor vip;
 
-int read_key()
-{
-	int nread;
-	char c;
-	while ((nread = read(STDIN_FILENO, &c, 1)) != 1) {
-		if (nread == -1 && errno != EAGAIN) {
-			die("read");
-		}
-	}
-
-	if (c == '\x1b') {
-		char seq[3];
-
-		if (read(STDIN_FILENO, &seq[0], 1) != 1)
-			return '\x1b';
-		if (read(STDIN_FILENO, &seq[1], 1) != 1)
-			return '\x1b';
-
-		if (seq[0] == '[') {
-			if (seq[1] >= '0' && seq[1] <= '9') {
-				if (read(STDIN_FILENO, &seq[2], 1) != 1)
-					return '\x1b';
-				if (seq[2] == '~') {
-					switch (seq[1]) {
-						case '1': return HOME_KEY;
-						case '3': return DEL_KEY;
-						case '4': return END_KEY;
-						case '5': return PAGE_UP;
-						case '6': return PAGE_DOWN;
-						case '7': return HOME_KEY;
-						case '8': return END_KEY;
-					}
-				}
-			} else {
-				switch (seq[1]) {
-					case 'A': return ARROW_UP;
-					case 'B': return ARROW_DOWN;
-					case 'C': return ARROW_RIGHT;
-					case 'D': return ARROW_LEFT;
-					case 'F': return END_KEY;
-					case 'H': return HOME_KEY;
-				}
-			}
-		} else if (seq[0] == 'O') {
-			switch (seq[1]) {
-				case 'F': return END_KEY;
-				case 'H': return HOME_KEY;
-			}
-		}
-		return '\x1b';
-	} else {
-		return c;
-	}
-}
-
-void save_file()
-{
-	if (vip.filename == NULL) {
-		vip.filename = prompt_editor("Save as: %s", NULL);
-		if (vip.filename == NULL) {
-			set_status_bar_message("Save aborted");
-			return;
-		}
-	}
-	int len;
-	char *buf = rows_to_str(&len);
-	int fd = open(vip.filename, O_RDWR | O_CREAT, 0644);
-	if (fd != -1) {
-		if (ftruncate(fd, len) != -1) {
-			if (write(fd, buf, len) == len) {
-				close(fd);
-				free(buf);
-				vip.dirty = 0;
-				set_status_bar_message("\"%s\" %dL, %dB written", vip.filename, vip.rows, len);
-				return;
-			}
-		}
-		close(fd);
-	}
-	free(buf);
-	set_status_bar_message("Error saving: %s", strerror(errno));
-}
-
 void abAppend(struct abuf *ab, const char *s, int len)
 {
 	char *new = realloc(ab->b, ab->len + len);
@@ -115,302 +28,6 @@ void abFree(struct abuf *ab)
 	free(ab->b);
 }
 
-void scroll()
-{
-	vip.rx = 0;
-	if (vip.cy < vip.rows) {
-		vip.rx = row_cx_to_rx(&vip.row[vip.cy], vip.cx);
-	}
-	if (vip.cy < vip.rowoff) {
-		vip.rowoff = vip.cy;
-	}
-	if (vip.cy >= vip.rowoff + vip.screenrows) {
-		vip.rowoff = vip.cy - vip.screenrows + 1;
-	}
-	if (vip.rx < vip.coloff) {
-		vip.coloff = vip.rx;
-	}
-	if (vip.rx >= vip.coloff + vip.screencols) {
-		vip.coloff = vip.rx - vip.screencols + 1;
-	}
-}
-
-void draw_rows(struct abuf *ab)
-{
-	for (int y = 0; y < vip.screenrows; y++) {
-		int filerow = y + vip.rowoff;
-		if (filerow >= vip.rows) {
-			if (vip.rows == 0 && y == vip.screenrows / 3) {
-				char welcome[11];
-				int welcomelen = snprintf(welcome, sizeof(welcome),
-						"VIP v%s", VERSION);
-				if (welcomelen > vip.screencols)
-					welcomelen = vip.screencols;
-				int padding = (vip.screencols - welcomelen) / 2;
-				if (padding) {
-					abAppend(ab, "~", 1);
-					padding--;
-				}
-				while (padding--) abAppend(ab, " ", 1);
-				abAppend(ab, welcome, welcomelen);
-			} else {
-				abAppend(ab, "~", 1);
-			}
-		} else {
-			int len = vip.row[filerow].render_size - vip.coloff;
-			if (len < 0) len = 0;
-			if (len > vip.screencols) len = vip.screencols;
-			char *c = &vip.row[filerow].render[vip.coloff];
-			unsigned char *hl = &vip.row[filerow].hl[vip.coloff];
-
-			char *current_color = malloc(COLOR_LEN * 2);
-			for (int j = 0; j < len; j++) {
-				if (hl[j] == HL_NORMAL) {
-					if (strncmp(current_color, WHITE_BG, COLOR_LEN)) {
-						abAppend(ab, WHITE_BG, COLOR_LEN);
-						memcpy(current_color, WHITE_BG, COLOR_LEN);
-					}
-					abAppend(ab, &c[j], 1);
-				} else {
-					size_t len;
-					char *color = syntax_to_color(hl[j], &len);
-					if (strncmp(current_color, color, len)) {
-						memcpy(current_color, color, len);
-						abAppend(ab, color, len);
-					}
-					free(color);
-					abAppend(ab, &c[j], 1);
-				}
-			}
-			abAppend(ab, WHITE_BG, COLOR_LEN);
-		}
-
-		abAppend(ab, "\x1b[K", 3);
-		abAppend(ab, "\r\n", 2);
-	}
-}
-
-void refresh_screen()
-{
-	scroll();
-
-	struct abuf ab = ABUF_INIT;
-
-	abAppend(&ab, "\x1b[?25l", 6);
-	abAppend(&ab, "\x1b[H", 3);
-
-	draw_rows(&ab);
-	draw_status_bar(&ab);
-	draw_message_bar(&ab);
-
-	char buf[32];
-	snprintf(buf, sizeof(buf), "\x1b[%d;%dH", (vip.cy - vip.rowoff) + 1,
-			(vip.rx - vip.coloff) + 1);
-	abAppend(&ab, buf, strlen(buf));
-
-	abAppend(&ab, "\x1b[?25h", 6);
-
-	write(STDOUT_FILENO, ab.b, ab.len);
-	abFree(&ab);
-}
-
-void move_cursor(int key)
-{
-	row *row = (vip.cy >= vip.rows) ? NULL : &vip.row[vip.cy];
-	switch (key) {
-		case ARROW_LEFT:
-			if (vip.cx != 0) {
-				vip.cx--;
-			}
-			break;
-		case ARROW_RIGHT:
-			if (row && vip.cx < row->size) {
-				vip.cx++;
-			}
-			break;
-		case ARROW_UP:
-			if (vip.cy != 0) {
-				vip.cy--;
-			}
-			break;
-		case ARROW_DOWN:
-			if (vip.cy < vip.rows) {
-				vip.cy++;
-			}
-			break;
-	}
-	row = (vip.cy >= vip.rows) ? NULL : &vip.row[vip.cy];
-	int rowlen = row ? row->size : 0;
-	if (vip.cx > rowlen) {
-		vip.cx = rowlen;
-	}
-}
-
-void process_key()
-{
-
-	int c = read_key();
-	switch (c) {
-		case '\r':
-			insert_new_line();
-			break;
-
-		case HOME_KEY:
-			vip.cx = 0;
-			break;
-
-		case END_KEY:
-			if (vip.cy < vip.rows) {
-				vip.cx = vip.row[vip.cy].size;
-			}
-			break;
-
-		case BACKSPACE:
-		case CTRL_KEY('h'):
-		case DEL_KEY: /* PASSTHROUGH */
-			if (vip.mode == INSERT) {
-				if (c == DEL_KEY)
-					move_cursor(ARROW_RIGHT);
-				del_char();
-			}
-			break;
-
-		case PAGE_UP:
-		case PAGE_DOWN:
-			{
-				if (c == PAGE_UP) {
-					vip.cy = vip.rowoff;
-				} else if (c == PAGE_DOWN) {
-					vip.cy = vip.rowoff + vip.screenrows - 1;
-					if (vip.cy > vip.rows) vip.cy = vip.rows;
-				}
-				int times = vip.screenrows;
-				while (times--)
-					move_cursor(c == PAGE_UP ? ARROW_UP : ARROW_DOWN);
-			}
-			break;
-
-		case ARROW_UP:
-		case ARROW_DOWN:
-		case ARROW_LEFT:
-		case ARROW_RIGHT:
-			if (vip.mode == INSERT) {
-				move_cursor(c);
-			}
-			break;
-
-		case CTRL_KEY('l'):
-		case '\x1b':
-			if (vip.mode == INSERT) {
-				vip.mode = NORMAL;
-				move_cursor(ARROW_LEFT);
-			}
-			break;
-
-		case 'i':
-			if (vip.mode == NORMAL) {
-				vip.mode = INSERT;
-			}
-			break;
-
-		case ':': /* PASSTHROUGH */
-			if (vip.mode == NORMAL) {
-				vip.mode = COMMAND;
-				char *cmd = prompt_editor(":%s", NULL);
-				if (cmd == NULL) {
-					vip.mode = NORMAL;
-					return;
-				}
-				switch (cmd[0]) {
-					case 'q':
-						if (cmd[1] == '!') {
-							write(STDOUT_FILENO, "\x1b[2J", 4);
-							write(STDOUT_FILENO, "\x1b[H", 3);
-							exit(0);
-							break;
-						} else {
-							if (vip.dirty) {
-								set_status_bar_message("No write since last change for buffer \"%s\"", vip.filename);
-								vip.mode = NORMAL;
-								return;
-							}
-							write(STDOUT_FILENO, "\x1b[2J", 4);
-							write(STDOUT_FILENO, "\x1b[H", 3);
-							exit(0);
-							break;
-
-						}
-					case 'w':
-						save_file();
-						vip.mode = NORMAL;
-				}
-			}
-		case '/': /* PASSTHROUGH */
-			if (vip.mode == NORMAL) {
-				find_editor();
-				break;
-			}
-
-		case 'k': /* PASSTHROUGH */
-			if (vip.mode != INSERT) {
-				move_cursor(ARROW_UP);
-				break;
-			}
-
-		case 'j': /* PASSTHROUGH */
-			if (vip.mode != INSERT) {
-				move_cursor(ARROW_DOWN);
-				break;
-			}
-
-		case 'l': /* PASSTHROUGH */
-			if (vip.mode != INSERT) {
-				move_cursor(ARROW_RIGHT);
-				break;
-			}
-
-		case 'h': /* PASSTHROUGH */
-			if (vip.mode != INSERT) {
-				move_cursor(ARROW_LEFT);
-				break;
-			}
-
-		case 'o': /* PASSTHROUGH */
-			if (vip.mode == NORMAL) {
-				shift_new_line();
-				vip.mode = INSERT;
-				break;
-			}
-
-		default:
-			if (vip.mode == INSERT) {
-				insert_char(c);
-			}
-			break;
-	}
-}
-
-void init_editor()
-{
-	vip.cx = 0;
-	vip.cy = 0;
-	vip.rx = 0;
-	vip.rowoff = 0;
-	vip.coloff = 0;
-	vip.rows = 0;
-	vip.row = NULL;
-	vip.dirty = 0;
-	vip.mode = NORMAL;
-	vip.filename = NULL;
-	vip.statusmsg[0] = '\0';
-	vip.statusmsg_time = 0;
-
-	if (get_window_size(&vip.screenrows, &vip.screencols) == -1) {
-		die("get_window_size");
-	}
-	vip.screenrows -= 2;
-}
-
 int main(int argc, char **argv)
 {
 	setup_term();