Refactor next step.

pom.xml

@@ -211,6 +211,7 @@
                 <configuration>
 <!--                    <verbose>true</verbose>-->
                     <docfilessubdirs>true</docfilessubdirs>
+                    <excludePackageNames>com.speedment.internal.*</excludePackageNames>
                 </configuration>
                 <executions>
                     <execution>

src/main/java/com/speedment/api/Entity.java → src/main/java/com/speedment/Entity.java

@@ -14,12 +14,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.api;
+package com.speedment;
 
-import com.speedment.api.db.MetaResult;
-import com.speedment.api.annotation.Api;
-import com.speedment.api.exception.SpeedmentException;
-import com.speedment.core.field.encoder.JsonEncoder;
+import com.speedment.db.MetaResult;
+import com.speedment.annotation.Api;
+import com.speedment.exception.SpeedmentException;
+import com.speedment.internal.core.field.encoder.JsonEncoder;
 import java.util.function.Consumer;
 
 /**

src/main/java/com/speedment/api/HasSpeedment.java → src/main/java/com/speedment/HasSpeedment.java

@@ -14,9 +14,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.api;
+package com.speedment;
 
-import com.speedment.api.annotation.Api;
+import com.speedment.annotation.Api;
 
 /**
  *

src/main/java/com/speedment/api/Manager.java → src/main/java/com/speedment/Manager.java

@@ -14,14 +14,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.api;
-
-import com.speedment.api.db.MetaResult;
-import com.speedment.api.annotation.Api;
-import com.speedment.api.config.Column;
-import com.speedment.api.config.Table;
-import com.speedment.api.exception.SpeedmentException;
-import com.speedment.core.runtime.Lifecyclable;
+package com.speedment;
+
+import com.speedment.db.MetaResult;
+import com.speedment.annotation.Api;
+import com.speedment.config.Column;
+import com.speedment.config.Table;
+import com.speedment.exception.SpeedmentException;
+import com.speedment.internal.core.runtime.Lifecyclable;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 

src/main/java/com/speedment/api/Speedment.java → src/main/java/com/speedment/Speedment.java

@@ -14,11 +14,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.api;
+package com.speedment;
 
-import com.speedment.core.platform.component.Component;
-import com.speedment.api.annotation.Api;
-import com.speedment.api.exception.SpeedmentException;
+import com.speedment.internal.core.platform.component.Component;
+import com.speedment.annotation.Api;
+import com.speedment.exception.SpeedmentException;
 
 /**
  * The {@code Platform} class acts as a generic holder of different system
@@ -40,14 +40,14 @@ public interface Speedment {
      * <p>
      * The supported standard interfaces are:
      * <ul>
-     * <li>{@link com.speedment.core.platform.component.EntityManager}</li>
-     * <li>{@link com.speedment.core.platform.component.DbmsHandlerComponent}</li>
-     * <li>{@link com.speedment.core.platform.component.ManagerComponent}</li>
-     * <li>{@link com.speedment.core.platform.component.PrimaryKeyFactoryComponent}</li>
-     * <li>{@link com.speedment.core.platform.component.ProjectComponent}</li>
-     * <li>{@link com.speedment.core.platform.component.SqlTypeMapperComponent}</li>
-     * <li>{@link com.speedment.core.platform.component.LoggerFactoryComponent}</li>
-     * <li>{@link com.speedment.core.platform.component.JavaTypeMapperComponent}</li>
+     * <li>{@link com.speedment.internal.core.platform.component.EntityManager}</li>
+     * <li>{@link com.speedment.internal.core.platform.component.DbmsHandlerComponent}</li>
+     * <li>{@link com.speedment.internal.core.platform.component.ManagerComponent}</li>
+     * <li>{@link com.speedment.internal.core.platform.component.PrimaryKeyFactoryComponent}</li>
+     * <li>{@link com.speedment.internal.core.platform.component.ProjectComponent}</li>
+     * <li>{@link com.speedment.internal.core.platform.component.SqlTypeMapperComponent}</li>
+     * <li>{@link com.speedment.internal.core.platform.component.LoggerFactoryComponent}</li>
+     * <li>{@link com.speedment.internal.core.platform.component.JavaTypeMapperComponent}</li>
      * </ul>
      *
      * @param <R> The intended return type

src/main/java/com/speedment/SpeedmentVersion.java

@@ -16,7 +16,7 @@
  */
 package com.speedment;
 
-import static com.speedment.util.Util.instanceNotAllowed;
+import static com.speedment.internal.util.StaticClassUtil.instanceNotAllowed;
 
 /**
  * This class holds the parameters normally held in the JAR MANIFEST. By holding

src/main/java/com/speedment/api/annotation/Api.java → src/main/java/com/speedment/annotation/Api.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.api.annotation;
+package com.speedment.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/speedment/api/annotation/External.java → src/main/java/com/speedment/annotation/External.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.api.annotation;
+package com.speedment.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;