diff --git a/src/main/java/org/ipfs/api/Base58.java b/src/main/java/org/ipfs/api/Base58.java
index 89a81bf..1f7ad39 100644
--- a/src/main/java/org/ipfs/api/Base58.java
+++ b/src/main/java/org/ipfs/api/Base58.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 /**
  * Copyright 2011 Google Inc.
diff --git a/src/main/java/org/ipfs/api/IPFS.java b/src/main/java/org/ipfs/api/IPFS.java
index 44b700d..cdf0039 100644
--- a/src/main/java/org/ipfs/api/IPFS.java
+++ b/src/main/java/org/ipfs/api/IPFS.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.net.*;
diff --git a/src/main/java/org/ipfs/api/JSONParser.java b/src/main/java/org/ipfs/api/JSONParser.java
index 283c095..581659a 100644
--- a/src/main/java/org/ipfs/api/JSONParser.java
+++ b/src/main/java/org/ipfs/api/JSONParser.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.util.*;
 
diff --git a/src/main/java/org/ipfs/api/MerkleNode.java b/src/main/java/org/ipfs/api/MerkleNode.java
index 5c8d407..da8b98d 100644
--- a/src/main/java/org/ipfs/api/MerkleNode.java
+++ b/src/main/java/org/ipfs/api/MerkleNode.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.util.*;
 import java.util.stream.*;
diff --git a/src/main/java/org/ipfs/api/MultiAddress.java b/src/main/java/org/ipfs/api/MultiAddress.java
index b2b460b..0c66aff 100644
--- a/src/main/java/org/ipfs/api/MultiAddress.java
+++ b/src/main/java/org/ipfs/api/MultiAddress.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.util.*;
diff --git a/src/main/java/org/ipfs/api/Multihash.java b/src/main/java/org/ipfs/api/Multihash.java
index 0fbf38d..b561222 100644
--- a/src/main/java/org/ipfs/api/Multihash.java
+++ b/src/main/java/org/ipfs/api/Multihash.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.util.*;
diff --git a/src/main/java/org/ipfs/api/Multipart.java b/src/main/java/org/ipfs/api/Multipart.java
index 2225cd7..6673da7 100644
--- a/src/main/java/org/ipfs/api/Multipart.java
+++ b/src/main/java/org/ipfs/api/Multipart.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.net.*;
diff --git a/src/main/java/org/ipfs/api/NamedStreamable.java b/src/main/java/org/ipfs/api/NamedStreamable.java
index 0bed1cb..66b79da 100644
--- a/src/main/java/org/ipfs/api/NamedStreamable.java
+++ b/src/main/java/org/ipfs/api/NamedStreamable.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.util.*;
diff --git a/src/main/java/org/ipfs/api/Protocol.java b/src/main/java/org/ipfs/api/Protocol.java
index 1dbc649..3cf2b93 100644
--- a/src/main/java/org/ipfs/api/Protocol.java
+++ b/src/main/java/org/ipfs/api/Protocol.java
@@ -1,4 +1,4 @@
-package org.ipfs;
+package org.ipfs.api;
 
 import java.io.*;
 import java.net.*;
diff --git a/src/test/java/org/ipfs/api/Test.java b/src/test/java/org/ipfs/api/Test.java
index 5f18562..bd9953b 100644
--- a/src/test/java/org/ipfs/api/Test.java
+++ b/src/test/java/org/ipfs/api/Test.java
@@ -1,9 +1,12 @@
-package org.ipfs.test;
+package org.ipfs.api;
 
-import org.ipfs.*;
-
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
 
 public class Test {