diff --git a/pfs/Dockerfile b/pfs/Dockerfile
index fd0fef7..5984a5f 100644
--- a/pfs/Dockerfile
+++ b/pfs/Dockerfile
@@ -27,4 +27,4 @@
 RUN go get -u google.golang.org/protobuf/encoding/prototext
 RUN go get -u github.com/google/uuid
 
-WORKDIR /src/go/src/github.com/giolekva/pcloud
+WORKDIR /src/go/src/github.com/giolekva/pcloud/pfs
diff --git a/pfs/chunk/chunk.go b/pfs/chunk/chunk.go
index 67f6ca1..aaa1bfb 100644
--- a/pfs/chunk/chunk.go
+++ b/pfs/chunk/chunk.go
@@ -3,7 +3,7 @@
 import (
 	"io"
 
-	"github.com/giolekva/pcloud/api"
+	"github.com/giolekva/pcloud/pfs/api"
 )
 
 type ChunkInfo struct {
diff --git a/pfs/chunk/file.go b/pfs/chunk/file.go
index b0d3d5a..3502a50 100644
--- a/pfs/chunk/file.go
+++ b/pfs/chunk/file.go
@@ -4,7 +4,7 @@
 	"io"
 	"os"
 
-	"github.com/giolekva/pcloud/api"
+	"github.com/giolekva/pcloud/pfs/api"
 )
 
 type ReadOnlyFileChunk struct {
diff --git a/pfs/chunk/in_memory.go b/pfs/chunk/in_memory.go
index b2199ee..b9b55ec 100644
--- a/pfs/chunk/in_memory.go
+++ b/pfs/chunk/in_memory.go
@@ -5,7 +5,7 @@
 	"errors"
 	"io"
 
-	"github.com/giolekva/pcloud/api"
+	"github.com/giolekva/pcloud/pfs/api"
 )
 
 type InMemoryChunk struct {
diff --git a/pfs/chunk/remote.go b/pfs/chunk/remote.go
index 60aeb13..6d84241 100644
--- a/pfs/chunk/remote.go
+++ b/pfs/chunk/remote.go
@@ -4,7 +4,7 @@
 	"context"
 	"io"
 
-	"github.com/giolekva/pcloud/api"
+	"github.com/giolekva/pcloud/pfs/api"
 )
 
 type RemoteChunk struct {
diff --git a/pfs/chunk/replicator.go b/pfs/chunk/replicator.go
index f7f19ea..d8990a7 100644
--- a/pfs/chunk/replicator.go
+++ b/pfs/chunk/replicator.go
@@ -6,7 +6,7 @@
 
 	"google.golang.org/grpc"
 
-	"github.com/giolekva/pcloud/api"
+	"github.com/giolekva/pcloud/pfs/api"
 )
 
 type ReplicaAssignmentChangeListener interface {
diff --git a/pfs/chunk/server.go b/pfs/chunk/server.go
index 7f07227..d619f13 100644
--- a/pfs/chunk/server.go
+++ b/pfs/chunk/server.go
@@ -7,7 +7,7 @@
 
 	"sync"
 
-	"github.com/giolekva/pcloud/api"
+	"github.com/giolekva/pcloud/pfs/api"
 )
 
 type ChunkServer struct {
diff --git a/pfs/chunk/server_test.go b/pfs/chunk/server_test.go
index 99a6427..9549a06 100644
--- a/pfs/chunk/server_test.go
+++ b/pfs/chunk/server_test.go
@@ -5,7 +5,7 @@
 	"context"
 	"testing"
 
-	"github.com/giolekva/pcloud/api"
+	"github.com/giolekva/pcloud/pfs/api"
 )
 
 func TestStoreChunk(t *testing.T) {
diff --git a/pfs/chunk_server.go b/pfs/chunk_server.go
index 87b2006..04a266e 100644
--- a/pfs/chunk_server.go
+++ b/pfs/chunk_server.go
@@ -10,8 +10,8 @@
 
 	"google.golang.org/grpc"
 
-	"github.com/giolekva/pcloud/api"
-	"github.com/giolekva/pcloud/chunk"
+	"github.com/giolekva/pcloud/pfs/api"
+	"github.com/giolekva/pcloud/pfs/chunk"
 )
 
 var controllerAddress = flag.String("controller", "localhost:123", "Metadata storage address.")
diff --git a/pfs/client.go b/pfs/client.go
index eea744b..2abb47f 100644
--- a/pfs/client.go
+++ b/pfs/client.go
@@ -7,8 +7,8 @@
 
 	"google.golang.org/grpc"
 
-	"github.com/giolekva/pcloud/api"
-	"github.com/giolekva/pcloud/client"
+	"github.com/giolekva/pcloud/pfs/api"
+	"github.com/giolekva/pcloud/pfs/client"
 )
 
 var controllerAddress = flag.String("controller", "localhost:123", "Metadata storage address.")
diff --git a/pfs/client/client.go b/pfs/client/client.go
index 974c3e8..a8492a3 100644
--- a/pfs/client/client.go
+++ b/pfs/client/client.go
@@ -4,8 +4,8 @@
 	"context"
 	"os"
 
-	"github.com/giolekva/pcloud/api"
-	"github.com/giolekva/pcloud/chunk"
+	"github.com/giolekva/pcloud/pfs/api"
+	"github.com/giolekva/pcloud/pfs/chunk"
 )
 
 type FileUploader struct {
diff --git a/pfs/client/client_test.go b/pfs/client/client_test.go
index 9e2f7c6..b9f3002 100644
--- a/pfs/client/client_test.go
+++ b/pfs/client/client_test.go
@@ -6,8 +6,8 @@
 
 	"google.golang.org/grpc"
 
-	"github.com/giolekva/pcloud/api"
-	pt "github.com/giolekva/pcloud/testing"
+	"github.com/giolekva/pcloud/pfs/api"
+	pt "github.com/giolekva/pcloud/pfs/testing"
 )
 
 func TestUploadSmallFile(t *testing.T) {
diff --git a/pfs/controller/chunk.go b/pfs/controller/chunk.go
index 6bcb61a..5fb694f 100644
--- a/pfs/controller/chunk.go
+++ b/pfs/controller/chunk.go
@@ -1,7 +1,7 @@
 package controller
 
 import (
-	"github.com/giolekva/pcloud/api"
+	"github.com/giolekva/pcloud/pfs/api"
 )
 
 type chunkServerStatus int
diff --git a/pfs/controller/server.go b/pfs/controller/server.go
index 573790c..885ad55 100644
--- a/pfs/controller/server.go
+++ b/pfs/controller/server.go
@@ -8,7 +8,7 @@
 	"github.com/google/uuid"
 	"google.golang.org/grpc"
 
-	"github.com/giolekva/pcloud/api"
+	"github.com/giolekva/pcloud/pfs/api"
 )
 
 type chunkServers struct {
diff --git a/pfs/controller_server.go b/pfs/controller_server.go
index 79a5275..c905ba3 100644
--- a/pfs/controller_server.go
+++ b/pfs/controller_server.go
@@ -8,8 +8,8 @@
 
 	"google.golang.org/grpc"
 
-	"github.com/giolekva/pcloud/api"
-	"github.com/giolekva/pcloud/controller"
+	"github.com/giolekva/pcloud/pfs/api"
+	"github.com/giolekva/pcloud/pfs/controller"
 )
 
 var port = flag.Int("port", 123, "Port to listen on.")
diff --git a/pfs/testing/in_memory_env.go b/pfs/testing/in_memory_env.go
index 3daeecf..c3410be 100644
--- a/pfs/testing/in_memory_env.go
+++ b/pfs/testing/in_memory_env.go
@@ -9,9 +9,9 @@
 
 	"google.golang.org/grpc"
 
-	"github.com/giolekva/pcloud/api"
-	"github.com/giolekva/pcloud/chunk"
-	"github.com/giolekva/pcloud/controller"
+	"github.com/giolekva/pcloud/pfs/api"
+	"github.com/giolekva/pcloud/pfs/chunk"
+	"github.com/giolekva/pcloud/pfs/controller"
 )
 
 type InMemoryEnv struct {