diff --git a/src/main/java/co/aikar/commands/AikarTiming.java b/src/main/java/co/aikar/commands/AikarTiming.java
index 82424d14..2dd76002 100644
--- a/src/main/java/co/aikar/commands/AikarTiming.java
+++ b/src/main/java/co/aikar/commands/AikarTiming.java
@@ -26,7 +26,7 @@ package co.aikar.commands;
 import co.aikar.timings.Timing;
 import co.aikar.timings.Timings;
 
-public class AikarTiming implements CommandTiming {
+class AikarTiming implements CommandTiming {
     private final Timing timing;
     AikarTiming(BaseCommand command, String name) {
         super();
diff --git a/src/main/java/co/aikar/commands/contexts/CommandContexts.java b/src/main/java/co/aikar/commands/CommandContexts.java
similarity index 97%
rename from src/main/java/co/aikar/commands/contexts/CommandContexts.java
rename to src/main/java/co/aikar/commands/CommandContexts.java
index 1d367c50..6555f9c1 100644
--- a/src/main/java/co/aikar/commands/contexts/CommandContexts.java
+++ b/src/main/java/co/aikar/commands/CommandContexts.java
@@ -21,16 +21,15 @@
  *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package co.aikar.commands.contexts;
+package co.aikar.commands;
 
-import co.aikar.commands.InvalidCommandArgument;
 import co.aikar.commands.annotation.Single;
 import co.aikar.commands.annotation.Split;
 import co.aikar.commands.annotation.Optional;
 import co.aikar.commands.annotation.Values;
-import co.aikar.commands.CommandLog;
-import co.aikar.commands.CommandPatterns;
-import co.aikar.commands.CommandUtil;
+import co.aikar.commands.contexts.ContextResolver;
+import co.aikar.commands.contexts.OnlinePlayer;
+import co.aikar.commands.contexts.SenderAwareContextResolver;
 import com.google.common.collect.Maps;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -44,7 +43,7 @@ import org.bukkit.inventory.ItemStack;
 import java.util.List;
 import java.util.Map;
 
-public final class CommandContexts {
+final class CommandContexts {
     private static final Map<Class<?>, ContextResolver<?>> contextMap = Maps.newHashMap();
 
     private CommandContexts() {}
diff --git a/src/main/java/co/aikar/commands/contexts/CommandExecutionContext.java b/src/main/java/co/aikar/commands/CommandExecutionContext.java
similarity index 98%
rename from src/main/java/co/aikar/commands/contexts/CommandExecutionContext.java
rename to src/main/java/co/aikar/commands/CommandExecutionContext.java
index 288a7bf4..3c0965d9 100644
--- a/src/main/java/co/aikar/commands/contexts/CommandExecutionContext.java
+++ b/src/main/java/co/aikar/commands/CommandExecutionContext.java
@@ -21,14 +21,13 @@
  *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package co.aikar.commands.contexts;
+package co.aikar.commands;
 
-import co.aikar.commands.RegisteredCommand;
 import co.aikar.commands.annotation.Default;
 import co.aikar.commands.annotation.Flags;
 import co.aikar.commands.annotation.Optional;
-import co.aikar.commands.CommandPatterns;
-import co.aikar.commands.CommandUtil;
+import co.aikar.commands.contexts.ContextResolver;
+import co.aikar.commands.contexts.SenderAwareContextResolver;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/co/aikar/commands/CommandLog.java b/src/main/java/co/aikar/commands/CommandLog.java
index 103c8b55..f5340546 100644
--- a/src/main/java/co/aikar/commands/CommandLog.java
+++ b/src/main/java/co/aikar/commands/CommandLog.java
@@ -27,7 +27,7 @@ import org.apache.commons.lang.exception.ExceptionUtils;
 
 import java.util.logging.Logger;
 
-public final class CommandLog {
+final class CommandLog {
     public static Logger LOGGER;
 
     private CommandLog() {}
diff --git a/src/main/java/co/aikar/commands/CommandPatterns.java b/src/main/java/co/aikar/commands/CommandPatterns.java
index 7afaa91b..f59cb153 100644
--- a/src/main/java/co/aikar/commands/CommandPatterns.java
+++ b/src/main/java/co/aikar/commands/CommandPatterns.java
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
 @SuppressWarnings("WeakerAccess")
-public final class CommandPatterns {
+final class CommandPatterns {
     public static final Pattern COMMA = Pattern.compile(",");
     public static final Pattern NEWLINE = Pattern.compile("\n");
     public static final Pattern DASH = Pattern.compile("-");
diff --git a/src/main/java/co/aikar/commands/CommandTiming.java b/src/main/java/co/aikar/commands/CommandTiming.java
index 023c14b3..962e680c 100644
--- a/src/main/java/co/aikar/commands/CommandTiming.java
+++ b/src/main/java/co/aikar/commands/CommandTiming.java
@@ -23,7 +23,7 @@
 
 package co.aikar.commands;
 
-public interface CommandTiming {
+interface CommandTiming {
     void startTiming();
     void stopTiming();
 }
diff --git a/src/main/java/co/aikar/commands/CommandUtil.java b/src/main/java/co/aikar/commands/CommandUtil.java
index ce2eef5d..9189e737 100644
--- a/src/main/java/co/aikar/commands/CommandUtil.java
+++ b/src/main/java/co/aikar/commands/CommandUtil.java
@@ -53,7 +53,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @SuppressWarnings("WeakerAccess")
-public final class CommandUtil {
+final class CommandUtil {
 
     public static final Random RANDOM = new Random();
 
diff --git a/src/main/java/co/aikar/commands/EmptyTiming.java b/src/main/java/co/aikar/commands/EmptyTiming.java
index c035ce60..2cf07367 100644
--- a/src/main/java/co/aikar/commands/EmptyTiming.java
+++ b/src/main/java/co/aikar/commands/EmptyTiming.java
@@ -23,7 +23,7 @@
 
 package co.aikar.commands;
 
-public class EmptyTiming implements CommandTiming {
+class EmptyTiming implements CommandTiming {
     EmptyTiming() {
         super();
     }
diff --git a/src/main/java/co/aikar/commands/RegisteredCommand.java b/src/main/java/co/aikar/commands/RegisteredCommand.java
index bd11c5c4..82414305 100644
--- a/src/main/java/co/aikar/commands/RegisteredCommand.java
+++ b/src/main/java/co/aikar/commands/RegisteredCommand.java
@@ -30,8 +30,6 @@ import co.aikar.commands.annotation.Default;
 import co.aikar.commands.annotation.Optional;
 import co.aikar.commands.annotation.Syntax;
 import co.aikar.commands.annotation.Values;
-import co.aikar.commands.contexts.CommandContexts;
-import co.aikar.commands.contexts.CommandExecutionContext;
 import co.aikar.commands.contexts.ContextResolver;
 import co.aikar.commands.contexts.SenderAwareContextResolver;
 import com.google.common.collect.Maps;
@@ -49,7 +47,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class RegisteredCommand {
+class RegisteredCommand {
     public final BaseCommand scope;
     public final String command;
     public final Method method;
diff --git a/src/main/java/co/aikar/commands/SpigotTiming.java b/src/main/java/co/aikar/commands/SpigotTiming.java
index 9419ba0b..cf37eced 100644
--- a/src/main/java/co/aikar/commands/SpigotTiming.java
+++ b/src/main/java/co/aikar/commands/SpigotTiming.java
@@ -25,7 +25,7 @@ package co.aikar.commands;
 
 import org.spigotmc.CustomTimingsHandler;
 
-public class SpigotTiming implements CommandTiming {
+class SpigotTiming implements CommandTiming {
     private final CustomTimingsHandler timing;
 
     SpigotTiming(String name) {
diff --git a/src/main/java/co/aikar/commands/contexts/ContextResolver.java b/src/main/java/co/aikar/commands/contexts/ContextResolver.java
index 0870432d..6887e581 100644
--- a/src/main/java/co/aikar/commands/contexts/ContextResolver.java
+++ b/src/main/java/co/aikar/commands/contexts/ContextResolver.java
@@ -23,6 +23,7 @@
 
 package co.aikar.commands.contexts;
 
+import co.aikar.commands.CommandExecutionContext;
 import co.aikar.commands.InvalidCommandArgument;
 
 @FunctionalInterface