diff --git a/Makefile b/Makefile
index 637b866..3fc954d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 WINTERSMITH = ./node_modules/.bin/wintersmith
-ARTICLE_DIR = ./contents/is/writing/about
+ARTICLE_DIR = ./contents/writing/about
 
 build:
 	@$(WINTERSMITH) build
@@ -16,7 +16,7 @@ add_article:
 	dir=`echo $$title | sed "s/ /-/g"`;\
 	mkdir -p $(ARTICLE_DIR)/$$dir;\
 	cat base.md | sed "s/{title}/$$title/g" | sed s/{date}/`date "+%Y-%m-%d"`/g> $(ARTICLE_DIR)/$$dir/index.md;\
-	emacs $(ARTICLE_DIR)/$$dir/index.md
+	$(EDITOR) $(ARTICLE_DIR)/$$dir/index.md
 
 remove_article:
 	@echo "Enter Article Title: "
@@ -28,6 +28,6 @@ edit_article:
 	@echo "Enter Article Title: "
 	@read title;\
 	dir=`echo $$title | sed "s/ /-/g"`;\
-	emacs $(ARTICLE_DIR)/$$dir/index.md
+	$(EDITOR) $(ARTICLE_DIR)/$$dir/index.md
 
 .PHONY: build clean preview add_article remove_article edit_article
diff --git a/contents/is/writing/about/.empty b/contents/writing/about/.empty
similarity index 100%
rename from contents/is/writing/about/.empty
rename to contents/writing/about/.empty
diff --git a/contents/writing/about/test/index.md b/contents/writing/about/test/index.md
new file mode 100644
index 0000000..f1a00f5
--- /dev/null
+++ b/contents/writing/about/test/index.md
@@ -0,0 +1,8 @@
+---
+title: test
+author: Brett Langdon
+date: 2013-11-16
+template: article.jade
+---
+
+Hello
diff --git a/plugins/paginator.coffee b/plugins/paginator.coffee
index 677aba9..5cd4bd5 100644
--- a/plugins/paginator.coffee
+++ b/plugins/paginator.coffee
@@ -17,7 +17,7 @@ module.exports = (env, callback) ->
   getArticles = (contents) ->
     # helper that returns a list of articles found in *contents*
     # note that each article is assumed to have its own directory in the articles directory
-    articles = contents.is.writing.about._.directories.map (item) -> item.index
+    articles = contents.writing.about._.directories.map (item) -> item.index
     articles.sort (a, b) -> b.date - a.date
     return articles