Attempting to collapse package up a level

since I'm not feeling like I'm going to tackle this in another
language... yet.

conway/Makefile

@@ -1,8 +1,8 @@
 LIBS := \
-	github.com/meatballhat/box-o-sand/conway/go
+	github.com/meatballhat/box-o-sand/conway
 TARGETS := \
 	$(LIBS) \
-	github.com/meatballhat/box-o-sand/conway/go/conways-game-of-life
+	github.com/meatballhat/box-o-sand/conway/conways-game-of-life
 
 
 all: deps build

conway/conway_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 import (
-	. "github.com/meatballhat/box-o-sand/conway/go"
+	. "github.com/meatballhat/box-o-sand/conway"
 )
 
 var TEST_SIMPLE_INITIAL_STATE = NewGameState(16, 16)

conway/conways-game-of-life/main.go

@@ -8,7 +8,7 @@ import (
 )
 
 import (
-	. "github.com/meatballhat/box-o-sand/conway/go"
+	. "github.com/meatballhat/box-o-sand/conway"
 )
 
 var (