diff --git a/config/config.go b/config/config.go
index 1af7c8fe..75c81ad1 100644
--- a/config/config.go
+++ b/config/config.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/rancherio/rancher-compose/project"
+	"github.com/rancherio/rancher-compose/librcompose/project"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/rancherio/os/util"
diff --git a/config/default.go b/config/default.go
index f6a471b3..e99b824f 100644
--- a/config/default.go
+++ b/config/default.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/rancherio/rancher-compose/project"
+	"github.com/rancherio/rancher-compose/librcompose/project"
 )
 
 func NewConfig() *Config {
diff --git a/config/types.go b/config/types.go
index 22dbeee7..3a24087a 100644
--- a/config/types.go
+++ b/config/types.go
@@ -1,6 +1,6 @@
 package config
 
-import "github.com/rancherio/rancher-compose/project"
+import "github.com/rancherio/rancher-compose/librcompose/project"
 
 const (
 	DEFAULT_IMAGE_VERSION = "v0.3.0-rc2"
diff --git a/docker/container.go b/docker/container.go
index c0d2d187..fea7de73 100644
--- a/docker/container.go
+++ b/docker/container.go
@@ -18,8 +18,8 @@ import (
 	dockerClient "github.com/fsouza/go-dockerclient"
 	"github.com/rancherio/os/config"
 	"github.com/rancherio/os/util"
-	"github.com/rancherio/rancher-compose/docker"
-	"github.com/rancherio/rancher-compose/project"
+	"github.com/rancherio/rancher-compose/librcompose/docker"
+	"github.com/rancherio/rancher-compose/librcompose/project"
 )
 
 type Container struct {
diff --git a/docker/factory.go b/docker/factory.go
index d0842b61..29099011 100644
--- a/docker/factory.go
+++ b/docker/factory.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancherio/os/config"
 	"github.com/rancherio/os/util"
-	"github.com/rancherio/rancher-compose/project"
+	"github.com/rancherio/rancher-compose/librcompose/project"
 )
 
 type ContainerFactory struct {
@@ -39,7 +39,7 @@ func (c *containerBasedService) Up() error {
 
 	var event project.Event
 
-	c.project.Notify(project.CONTAINER_STARTING, c, map[string]string{})
+	c.project.Notify(project.CONTAINER_STARTING, c.name, map[string]string{})
 
 	if fakeCreate {
 		event = project.CONTAINER_CREATED
@@ -60,7 +60,7 @@ func (c *containerBasedService) Up() error {
 	}
 
 	if container.Container != nil {
-		c.project.Notify(event, c, map[string]string{
+		c.project.Notify(event, c.name, map[string]string{
 			project.CONTAINER_ID: container.Container.ID,
 		})
 	}
diff --git a/docker/services.go b/docker/services.go
index 58af75d4..6a7efda1 100644
--- a/docker/services.go
+++ b/docker/services.go
@@ -7,7 +7,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/rancherio/os/config"
 	"github.com/rancherio/os/util"
-	"github.com/rancherio/rancher-compose/project"
+	"github.com/rancherio/rancher-compose/librcompose/project"
 )
 
 type configEnvironment struct {
@@ -117,7 +117,7 @@ func RunServices(name string, cfg *config.Config, configs map[string]*project.Se
 
 	go func() {
 		for event := range projectEvents {
-			if event.Event == project.CONTAINER_STARTED && event.Service.Name() == "network" {
+			if event.Event == project.CONTAINER_STARTED && event.ServiceName == "network" {
 				network = true
 			}
 		}
diff --git a/init/bootstrap.go b/init/bootstrap.go
index 152f9714..11983e9e 100644
--- a/init/bootstrap.go
+++ b/init/bootstrap.go
@@ -10,7 +10,7 @@ import (
 	"github.com/rancherio/os/config"
 	"github.com/rancherio/os/docker"
 	"github.com/rancherio/os/util"
-	"github.com/rancherio/rancher-compose/project"
+	"github.com/rancherio/rancher-compose/librcompose/project"
 )
 
 const boot2dockerMagic = "boot2docker, please format-me"