diff --git a/appengine/app.yaml b/app.yaml
similarity index 100%
rename from appengine/app.yaml
rename to app.yaml
diff --git a/appengine/appengine.go b/appengine.go
similarity index 96%
rename from appengine/appengine.go
rename to appengine.go
index 4631765..515f7e9 100644
--- a/appengine/appengine.go
+++ b/appengine.go
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cayleyappengine
+// +build appengine
+
+package main
 
 import (
 	"github.com/barakmich/glog"
diff --git a/appengine/30k.nt b/appengine/30k.nt
deleted file mode 120000
index 0f1665c..0000000
--- a/appengine/30k.nt
+++ /dev/null
@@ -1 +0,0 @@
-../30kmovies.nt
diff --git a/appengine/docs b/appengine/docs
deleted file mode 120000
index a9594bf..0000000
--- a/appengine/docs
+++ /dev/null
@@ -1 +0,0 @@
-../docs
\ No newline at end of file
diff --git a/appengine/static b/appengine/static
deleted file mode 120000
index 4dab164..0000000
--- a/appengine/static
+++ /dev/null
@@ -1 +0,0 @@
-../static
\ No newline at end of file
diff --git a/appengine/templates b/appengine/templates
deleted file mode 120000
index 564a409..0000000
--- a/appengine/templates
+++ /dev/null
@@ -1 +0,0 @@
-../templates
\ No newline at end of file
diff --git a/cayley.go b/cayley.go
index 24af7d3..87bf18b 100644
--- a/cayley.go
+++ b/cayley.go
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !appengine
+
 package main
 
 import (
diff --git a/appengine/cayley_appengine.cfg b/cayley_appengine.cfg
similarity index 100%
rename from appengine/cayley_appengine.cfg
rename to cayley_appengine.cfg