diff --git a/docker-network/BUILD b/docker/network/BUILD
similarity index 100%
rename from docker-network/BUILD
rename to docker/network/BUILD
diff --git a/docker-network/DockerNetworkTest.java b/docker/network/DockerNetworkTest.java
similarity index 99%
rename from docker-network/DockerNetworkTest.java
rename to docker/network/DockerNetworkTest.java
index 99d3eb59..616e9348 100644
--- a/docker-network/DockerNetworkTest.java
+++ b/docker/network/DockerNetworkTest.java
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+package docker.network;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/docker-network/Dockerfile b/docker/network/Dockerfile
similarity index 100%
rename from docker-network/Dockerfile
rename to docker/network/Dockerfile
diff --git a/docker-network/README.md b/docker/network/README.md
similarity index 100%
rename from docker-network/README.md
rename to docker/network/README.md
diff --git a/docker-network/WORKSPACE b/docker/network/WORKSPACE
similarity index 100%
rename from docker-network/WORKSPACE
rename to docker/network/WORKSPACE
diff --git a/docker-sandbox/.bazelrc b/docker/sandbox/.bazelrc
similarity index 100%
rename from docker-sandbox/.bazelrc
rename to docker/sandbox/.bazelrc
diff --git a/docker-sandbox/.bazelversion b/docker/sandbox/.bazelversion
similarity index 100%
rename from docker-sandbox/.bazelversion
rename to docker/sandbox/.bazelversion
diff --git a/docker-sandbox/BUILD b/docker/sandbox/BUILD
similarity index 100%
rename from docker-sandbox/BUILD
rename to docker/sandbox/BUILD
diff --git a/docker-sandbox/Hello.java b/docker/sandbox/Hello.java
similarity index 81%
rename from docker-sandbox/Hello.java
rename to docker/sandbox/Hello.java
index f0ba0c91..e713d721 100644
--- a/docker-sandbox/Hello.java
+++ b/docker/sandbox/Hello.java
@@ -1,3 +1,5 @@
+package docker.sandbox;
+
 public class Hello {
   public static void main(String[] args) {
     System.out.println("Hello Java!");
diff --git a/docker-sandbox/README.md b/docker/sandbox/README.md
similarity index 100%
rename from docker-sandbox/README.md
rename to docker/sandbox/README.md
diff --git a/docker-sandbox/WORKSPACE b/docker/sandbox/WORKSPACE
similarity index 100%
rename from docker-sandbox/WORKSPACE
rename to docker/sandbox/WORKSPACE
diff --git a/docker-sandbox/hello.cc b/docker/sandbox/hello.cc
similarity index 100%
rename from docker-sandbox/hello.cc
rename to docker/sandbox/hello.cc