diff --git a/master.go b/master.go
index 1b791c0..79a5275 100644
--- a/master.go
+++ b/master.go
@@ -9,7 +9,7 @@
 	"google.golang.org/grpc"
 
 	"github.com/giolekva/pcloud/api"
-	"github.com/giolekva/pcloud/master"
+	"github.com/giolekva/pcloud/controller"
 )
 
 var port = flag.Int("port", 123, "Port to listen on.")
@@ -23,7 +23,7 @@
 	}
 	log.Printf("Listening on port: %d", *port)
 	server := grpc.NewServer()
-	api.RegisterMetadataStorageServer(server, master.NewMasterServer())
+	api.RegisterMetadataStorageServer(server, controller.NewMasterServer())
 	log.Print("Master serving")
 	server.Serve(lis)
 }