http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicSplineInterpolatorTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicSplineInterpolatorTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicSplineInterpolatorTest.java
index 6de42a2..83023d3 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicSplineInterpolatorTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicSplineInterpolatorTest.java
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.interpolation;
-
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.analysis.TrivariateFunction;
+package org.apache.commons.math4.analysis.interpolation;
+
+import org.apache.commons.math4.analysis.TrivariateFunction;
+import 
org.apache.commons.math4.analysis.interpolation.TricubicSplineInterpolator;
+import 
org.apache.commons.math4.analysis.interpolation.TrivariateGridInterpolator;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.MathIllegalArgumentException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.Ignore;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
index cf3b9d6..907b2ac 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
@@ -14,14 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.interpolation;
+package org.apache.commons.math4.analysis.interpolation;
 
 import java.util.Random;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
-import org.apache.commons.math3.exception.NonMonotonicSequenceException;
 
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.interpolation.LinearInterpolator;
+import org.apache.commons.math4.analysis.interpolation.UnivariateInterpolator;
+import 
org.apache.commons.math4.analysis.interpolation.UnivariatePeriodicInterpolator;
+import org.apache.commons.math4.exception.NonMonotonicSequenceException;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
index b58631f..301bf52 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.polynomials;
+package org.apache.commons.math4.analysis.polynomials;
 
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import 
org.apache.commons.math4.analysis.polynomials.PolynomialFunctionLagrangeForm;
+import org.apache.commons.math4.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
index 215055b..b9e61d3 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.polynomials;
+package org.apache.commons.math4.analysis.polynomials;
 
-import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
+import 
org.apache.commons.math4.analysis.polynomials.PolynomialFunctionNewtonForm;
+import org.apache.commons.math4.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionTest.java
index af0dd7e..52be305 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.polynomials;
-
-import org.apache.commons.math3.TestUtils;
-import org.apache.commons.math3.util.FastMath;
+package org.apache.commons.math4.analysis.polynomials;
 
+import org.apache.commons.math4.TestUtils;
+import org.apache.commons.math4.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Test;
 import org.junit.Assert;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialSplineFunctionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialSplineFunctionTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialSplineFunctionTest.java
index b353a73..255203a 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialSplineFunctionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialSplineFunctionTest.java
@@ -14,14 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.polynomials;
+package org.apache.commons.math4.analysis.polynomials;
 
 import java.util.Arrays;
 
-import org.apache.commons.math3.exception.OutOfRangeException;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
-import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math4.analysis.polynomials.PolynomialSplineFunction;
+import org.apache.commons.math4.exception.MathIllegalArgumentException;
+import org.apache.commons.math4.exception.MathIllegalStateException;
+import org.apache.commons.math4.exception.OutOfRangeException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialsUtilsTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialsUtilsTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialsUtilsTest.java
index e87804b..ad13461 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialsUtilsTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/polynomials/PolynomialsUtilsTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.polynomials;
-
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import 
org.apache.commons.math3.analysis.integration.IterativeLegendreGaussIntegrator;
-import org.apache.commons.math3.util.CombinatoricsUtils;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.util.Precision;
+package org.apache.commons.math4.analysis.polynomials;
+
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import 
org.apache.commons.math4.analysis.integration.IterativeLegendreGaussIntegrator;
+import org.apache.commons.math4.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math4.analysis.polynomials.PolynomialsUtils;
+import org.apache.commons.math4.util.CombinatoricsUtils;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/BaseSecantSolverAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/BaseSecantSolverAbstractTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/BaseSecantSolverAbstractTest.java
index 3a83826..1b6f278 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/BaseSecantSolverAbstractTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/BaseSecantSolverAbstractTest.java
@@ -14,15 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
 
-import org.apache.commons.math3.analysis.QuinticFunction;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.XMinus5Function;
-import org.apache.commons.math3.analysis.function.Sin;
-import org.apache.commons.math3.exception.NoBracketingException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.analysis.QuinticFunction;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.XMinus5Function;
+import org.apache.commons.math4.analysis.function.Sin;
+import org.apache.commons.math4.analysis.solvers.AllowedSolution;
+import org.apache.commons.math4.analysis.solvers.BaseSecantSolver;
+import org.apache.commons.math4.analysis.solvers.BracketedUnivariateSolver;
+import org.apache.commons.math4.analysis.solvers.PegasusSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolverUtils;
+import org.apache.commons.math4.exception.NoBracketingException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/BisectionSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/BisectionSolverTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/BisectionSolverTest.java
index 2023471..d92ff1c 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/BisectionSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/BisectionSolverTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
 
-import org.apache.commons.math3.analysis.QuinticFunction;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.function.Sin;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.analysis.QuinticFunction;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.function.Sin;
+import org.apache.commons.math4.analysis.solvers.BisectionSolver;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/BracketingNthOrderBrentSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/BracketingNthOrderBrentSolverTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/BracketingNthOrderBrentSolverTest.java
index 8ae8a13..5f6c123 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/BracketingNthOrderBrentSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/BracketingNthOrderBrentSolverTest.java
@@ -15,14 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.analysis.solvers;
-
-import org.apache.commons.math3.analysis.QuinticFunction;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
-import 
org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
-import org.apache.commons.math3.exception.TooManyEvaluationsException;
+package org.apache.commons.math4.analysis.solvers;
+
+import org.apache.commons.math4.analysis.QuinticFunction;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
+import 
org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
+import org.apache.commons.math4.analysis.solvers.AllowedSolution;
+import org.apache.commons.math4.analysis.solvers.BracketingNthOrderBrentSolver;
+import org.apache.commons.math4.analysis.solvers.NewtonRaphsonSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
+import org.apache.commons.math4.exception.TooManyEvaluationsException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/BrentSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/BrentSolverTest.java 
b/src/test/java/org/apache/commons/math4/analysis/solvers/BrentSolverTest.java
index 897193f..59547d0 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/BrentSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/BrentSolverTest.java
@@ -14,22 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
 
-import org.apache.commons.math3.analysis.FunctionUtils;
-import org.apache.commons.math3.analysis.MonitoredFunction;
-import org.apache.commons.math3.analysis.QuinticFunction;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
-import 
org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
-import org.apache.commons.math3.analysis.function.Constant;
-import org.apache.commons.math3.analysis.function.Inverse;
-import org.apache.commons.math3.analysis.function.Sin;
-import org.apache.commons.math3.analysis.function.Sqrt;
-import org.apache.commons.math3.exception.NoBracketingException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
-import org.apache.commons.math3.exception.TooManyEvaluationsException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.analysis.FunctionUtils;
+import org.apache.commons.math4.analysis.MonitoredFunction;
+import org.apache.commons.math4.analysis.QuinticFunction;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
+import 
org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
+import org.apache.commons.math4.analysis.function.Constant;
+import org.apache.commons.math4.analysis.function.Inverse;
+import org.apache.commons.math4.analysis.function.Sin;
+import org.apache.commons.math4.analysis.function.Sqrt;
+import org.apache.commons.math4.analysis.solvers.BrentSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
+import org.apache.commons.math4.exception.NoBracketingException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.TooManyEvaluationsException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/IllinoisSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/IllinoisSolverTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/IllinoisSolverTest.java
index 2bc69e4..04680d9 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/IllinoisSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/IllinoisSolverTest.java
@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
+
+import org.apache.commons.math4.analysis.solvers.IllinoisSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
 
 /**
  * Test case for {@link IllinoisSolver Illinois} solver.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/LaguerreSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/LaguerreSolverTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/LaguerreSolverTest.java
index d97a8e6..6100710 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/LaguerreSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/LaguerreSolverTest.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.solvers;
-
-import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
-import org.apache.commons.math3.exception.NoBracketingException;
-import org.apache.commons.math3.complex.Complex;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.TestUtils;
+package org.apache.commons.math4.analysis.solvers;
+
+import org.apache.commons.math4.TestUtils;
+import org.apache.commons.math4.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math4.analysis.solvers.LaguerreSolver;
+import org.apache.commons.math4.complex.Complex;
+import org.apache.commons.math4.exception.NoBracketingException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/MullerSolver2Test.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/MullerSolver2Test.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/MullerSolver2Test.java
index a68bb02..b11fefc 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/MullerSolver2Test.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/MullerSolver2Test.java
@@ -14,15 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
 
-import org.apache.commons.math3.analysis.QuinticFunction;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.function.Expm1;
-import org.apache.commons.math3.analysis.function.Sin;
-import org.apache.commons.math3.exception.NoBracketingException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.analysis.QuinticFunction;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.function.Expm1;
+import org.apache.commons.math4.analysis.function.Sin;
+import org.apache.commons.math4.analysis.solvers.MullerSolver2;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
+import org.apache.commons.math4.exception.NoBracketingException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/MullerSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/MullerSolverTest.java 
b/src/test/java/org/apache/commons/math4/analysis/solvers/MullerSolverTest.java
index 03ee790..e82be52 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/MullerSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/MullerSolverTest.java
@@ -14,15 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
 
-import org.apache.commons.math3.analysis.QuinticFunction;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.function.Expm1;
-import org.apache.commons.math3.analysis.function.Sin;
-import org.apache.commons.math3.exception.NoBracketingException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.analysis.QuinticFunction;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.function.Expm1;
+import org.apache.commons.math4.analysis.function.Sin;
+import org.apache.commons.math4.analysis.solvers.MullerSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
+import org.apache.commons.math4.exception.NoBracketingException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/NewtonRaphsonSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/NewtonRaphsonSolverTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/NewtonRaphsonSolverTest.java
index 3080b91..807469e 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/NewtonRaphsonSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/NewtonRaphsonSolverTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
 
-import org.apache.commons.math3.analysis.QuinticFunction;
-import 
org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
-import org.apache.commons.math3.analysis.function.Sin;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.analysis.QuinticFunction;
+import 
org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
+import org.apache.commons.math4.analysis.function.Sin;
+import org.apache.commons.math4.analysis.solvers.NewtonRaphsonSolver;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/NewtonSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/NewtonSolverTest.java 
b/src/test/java/org/apache/commons/math4/analysis/solvers/NewtonSolverTest.java
index 7669125..e9b0896 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/NewtonSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/NewtonSolverTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.solvers;
-
-import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math3.analysis.QuinticFunction;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
-import 
org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
-import org.apache.commons.math3.analysis.function.Sin;
-import org.apache.commons.math3.util.FastMath;
+package org.apache.commons.math4.analysis.solvers;
+
+import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math4.analysis.QuinticFunction;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
+import 
org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
+import org.apache.commons.math4.analysis.function.Sin;
+import org.apache.commons.math4.analysis.solvers.NewtonSolver;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/PegasusSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/PegasusSolverTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/PegasusSolverTest.java
index 5f8fb90..d6de7a3 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/PegasusSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/PegasusSolverTest.java
@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
+
+import org.apache.commons.math4.analysis.solvers.PegasusSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
 
 /**
  * Test case for {@link PegasusSolver Pegasus} solver.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/RegulaFalsiSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/RegulaFalsiSolverTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/RegulaFalsiSolverTest.java
index 2afa3d2..8f3fece 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/RegulaFalsiSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/RegulaFalsiSolverTest.java
@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
 
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.exception.ConvergenceException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.solvers.RegulaFalsiSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
+import org.apache.commons.math4.exception.ConvergenceException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Test;
 import org.junit.Assert;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/RiddersSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/RiddersSolverTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/RiddersSolverTest.java
index afbdc59..fcff3e5 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/RiddersSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/RiddersSolverTest.java
@@ -14,15 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
 
-import org.apache.commons.math3.analysis.QuinticFunction;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.function.Expm1;
-import org.apache.commons.math3.analysis.function.Sin;
-import org.apache.commons.math3.exception.NoBracketingException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.analysis.QuinticFunction;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.function.Expm1;
+import org.apache.commons.math4.analysis.function.Sin;
+import org.apache.commons.math4.analysis.solvers.RiddersSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
+import org.apache.commons.math4.exception.NoBracketingException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/SecantSolverTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/SecantSolverTest.java 
b/src/test/java/org/apache/commons/math4/analysis/solvers/SecantSolverTest.java
index 9e0f178..59b8af9 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/SecantSolverTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/SecantSolverTest.java
@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.analysis.solvers;
+package org.apache.commons.math4.analysis.solvers;
+
+import org.apache.commons.math4.analysis.solvers.SecantSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
 
 /**
  * Test case for {@link SecantSolver Secant} solver.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/analysis/solvers/UnivariateSolverUtilsTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/analysis/solvers/UnivariateSolverUtilsTest.java
 
b/src/test/java/org/apache/commons/math4/analysis/solvers/UnivariateSolverUtilsTest.java
index 97c387e..e1ff1f2 100644
--- 
a/src/test/java/org/apache/commons/math4/analysis/solvers/UnivariateSolverUtilsTest.java
+++ 
b/src/test/java/org/apache/commons/math4/analysis/solvers/UnivariateSolverUtilsTest.java
@@ -15,14 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.analysis.solvers;
-
-import org.apache.commons.math3.analysis.QuinticFunction;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.function.Sin;
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
-import org.apache.commons.math3.exception.NoBracketingException;
-import org.apache.commons.math3.util.FastMath;
+package org.apache.commons.math4.analysis.solvers;
+
+import org.apache.commons.math4.analysis.QuinticFunction;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.function.Sin;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolverUtils;
+import org.apache.commons.math4.exception.MathIllegalArgumentException;
+import org.apache.commons.math4.exception.NoBracketingException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/complex/ComplexFieldTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/complex/ComplexFieldTest.java 
b/src/test/java/org/apache/commons/math4/complex/ComplexFieldTest.java
index f2f4e5e..50462fb 100644
--- a/src/test/java/org/apache/commons/math4/complex/ComplexFieldTest.java
+++ b/src/test/java/org/apache/commons/math4/complex/ComplexFieldTest.java
@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.complex;
+package org.apache.commons.math4.complex;
 
-import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math4.TestUtils;
+import org.apache.commons.math4.complex.Complex;
+import org.apache.commons.math4.complex.ComplexField;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/complex/ComplexFormatAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/complex/ComplexFormatAbstractTest.java 
b/src/test/java/org/apache/commons/math4/complex/ComplexFormatAbstractTest.java
index b57c26c..608ccf6 100644
--- 
a/src/test/java/org/apache/commons/math4/complex/ComplexFormatAbstractTest.java
+++ 
b/src/test/java/org/apache/commons/math4/complex/ComplexFormatAbstractTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.complex;
+package org.apache.commons.math4.complex;
 
 import java.text.NumberFormat;
 import java.text.ParsePosition;
@@ -23,8 +23,9 @@ import java.util.Locale;
 
 import org.junit.Test;
 import org.junit.Assert;
-
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.complex.Complex;
+import org.apache.commons.math4.complex.ComplexFormat;
+import org.apache.commons.math4.util.FastMath;
 
 public abstract class ComplexFormatAbstractTest {
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/complex/ComplexFormatTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/complex/ComplexFormatTest.java 
b/src/test/java/org/apache/commons/math4/complex/ComplexFormatTest.java
index d1c3630..b272bd2 100644
--- a/src/test/java/org/apache/commons/math4/complex/ComplexFormatTest.java
+++ b/src/test/java/org/apache/commons/math4/complex/ComplexFormatTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.complex;
+package org.apache.commons.math4.complex;
 
 import java.util.Locale;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/complex/ComplexTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/complex/ComplexTest.java 
b/src/test/java/org/apache/commons/math4/complex/ComplexTest.java
index 9996e68..dc2e626 100644
--- a/src/test/java/org/apache/commons/math4/complex/ComplexTest.java
+++ b/src/test/java/org/apache/commons/math4/complex/ComplexTest.java
@@ -15,14 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.complex;
+package org.apache.commons.math4.complex;
 
 import java.util.List;
 
-import org.apache.commons.math3.TestUtils;
-import org.apache.commons.math3.exception.NullArgumentException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.TestUtils;
+import org.apache.commons.math4.complex.Complex;
+import org.apache.commons.math4.complex.ComplexUtils;
+import org.apache.commons.math4.exception.NullArgumentException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 
@@ -796,6 +799,7 @@ public class ComplexTest {
     }
 
     @Test
+    @Ignore
     public void testJava() {// TODO more debug
         System.out.println(">>testJava()");
         // FastMathTest#testExpSpecialCases() checks the following:
@@ -824,21 +828,8 @@ public class ComplexTest {
 
     @Test
     public void testExpInf4() {
-        // TODO: temp debug start
-        System.out.println(">>testExpInf4()");
-        double inf = negInfOne.getReal();
-        System.out.println("inf="+inf);
-        int intVal = (int) -inf;
-        System.out.println("intval="+intVal);
-        System.out.println("neginf<0=" + (inf < 0.0));
-        // TODO: temp debug end
-        System.out.println("expReal="+FastMath.exp(negInfOne.getReal())); // 
TODO temp debug
-        System.out.println("cosImag="+FastMath.cos(negInfOne.getImaginary())); 
// TODO temp debug
-        System.out.println("sinImag="+FastMath.sin(negInfOne.getImaginary())); 
// TODO temp debug
         final Complex exp = negInfOne.exp();
-        System.out.println("result="+exp); // TODO temp debug
         TestUtils.assertSame(Complex.ZERO, exp);
-        System.out.println("<<testExpInf4()"); // TODO debug
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/complex/ComplexUtilsTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/complex/ComplexUtilsTest.java 
b/src/test/java/org/apache/commons/math4/complex/ComplexUtilsTest.java
index 759ba89..77c0d43 100644
--- a/src/test/java/org/apache/commons/math4/complex/ComplexUtilsTest.java
+++ b/src/test/java/org/apache/commons/math4/complex/ComplexUtilsTest.java
@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.complex;
+package org.apache.commons.math4.complex;
 
-import org.apache.commons.math3.TestUtils;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.TestUtils;
+import org.apache.commons.math4.complex.Complex;
+import org.apache.commons.math4.complex.ComplexUtils;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Test;
 import org.junit.Assert;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/complex/FrenchComplexFormatTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/complex/FrenchComplexFormatTest.java 
b/src/test/java/org/apache/commons/math4/complex/FrenchComplexFormatTest.java
index 2fbe831..4f9caec 100644
--- 
a/src/test/java/org/apache/commons/math4/complex/FrenchComplexFormatTest.java
+++ 
b/src/test/java/org/apache/commons/math4/complex/FrenchComplexFormatTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.complex;
+package org.apache.commons.math4.complex;
 
 import java.util.Locale;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/complex/QuaternionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/complex/QuaternionTest.java 
b/src/test/java/org/apache/commons/math4/complex/QuaternionTest.java
index b81e260..56658e3 100644
--- a/src/test/java/org/apache/commons/math4/complex/QuaternionTest.java
+++ b/src/test/java/org/apache/commons/math4/complex/QuaternionTest.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.complex;
+package org.apache.commons.math4.complex;
 
 import java.util.Random;
-import org.apache.commons.math3.complex.Quaternion;
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.exception.ZeroException;
-import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
-import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
-import org.apache.commons.math3.util.FastMath;
+
+import org.apache.commons.math4.complex.Quaternion;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.ZeroException;
+import org.apache.commons.math4.geometry.euclidean.threed.Rotation;
+import org.apache.commons.math4.geometry.euclidean.threed.Vector3D;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Test;
 import org.junit.Assert;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/complex/RootsOfUnityTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/complex/RootsOfUnityTest.java 
b/src/test/java/org/apache/commons/math4/complex/RootsOfUnityTest.java
index b91ffeb..6c0f91b 100644
--- a/src/test/java/org/apache/commons/math4/complex/RootsOfUnityTest.java
+++ b/src/test/java/org/apache/commons/math4/complex/RootsOfUnityTest.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.complex;
+package org.apache.commons.math4.complex;
 
-import org.apache.commons.math3.exception.MathIllegalStateException;
-import org.apache.commons.math3.exception.ZeroException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.complex.RootsOfUnity;
+import org.apache.commons.math4.exception.MathIllegalStateException;
+import org.apache.commons.math4.exception.ZeroException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/dfp/BracketingNthOrderBrentSolverDFPTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/dfp/BracketingNthOrderBrentSolverDFPTest.java
 
b/src/test/java/org/apache/commons/math4/dfp/BracketingNthOrderBrentSolverDFPTest.java
index 4c1b512..91419c7 100644
--- 
a/src/test/java/org/apache/commons/math4/dfp/BracketingNthOrderBrentSolverDFPTest.java
+++ 
b/src/test/java/org/apache/commons/math4/dfp/BracketingNthOrderBrentSolverDFPTest.java
@@ -15,11 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.dfp;
-
-import org.apache.commons.math3.analysis.solvers.AllowedSolution;
-import org.apache.commons.math3.exception.MathInternalError;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
+package org.apache.commons.math4.dfp;
+
+import org.apache.commons.math4.analysis.solvers.AllowedSolution;
+import org.apache.commons.math4.dfp.BracketingNthOrderBrentSolverDFP;
+import org.apache.commons.math4.dfp.Dfp;
+import org.apache.commons.math4.dfp.DfpField;
+import org.apache.commons.math4.dfp.DfpMath;
+import org.apache.commons.math4.dfp.UnivariateDfpFunction;
+import org.apache.commons.math4.exception.MathInternalError;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/dfp/Decimal10.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/dfp/Decimal10.java 
b/src/test/java/org/apache/commons/math4/dfp/Decimal10.java
index 25576e2..aee0568 100644
--- a/src/test/java/org/apache/commons/math4/dfp/Decimal10.java
+++ b/src/test/java/org/apache/commons/math4/dfp/Decimal10.java
@@ -15,7 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.dfp;
+package org.apache.commons.math4.dfp;
+
+import org.apache.commons.math4.dfp.Dfp;
+import org.apache.commons.math4.dfp.DfpDec;
+import org.apache.commons.math4.dfp.DfpField;
 
 public class Decimal10 extends DfpDec {
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/dfp/DfpDecTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/dfp/DfpDecTest.java 
b/src/test/java/org/apache/commons/math4/dfp/DfpDecTest.java
index fc65fd7..ead9c9e 100644
--- a/src/test/java/org/apache/commons/math4/dfp/DfpDecTest.java
+++ b/src/test/java/org/apache/commons/math4/dfp/DfpDecTest.java
@@ -15,8 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.dfp;
+package org.apache.commons.math4.dfp;
 
+import org.apache.commons.math4.dfp.Dfp;
+import org.apache.commons.math4.dfp.DfpDec;
+import org.apache.commons.math4.dfp.DfpField;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/dfp/DfpMathTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/dfp/DfpMathTest.java 
b/src/test/java/org/apache/commons/math4/dfp/DfpMathTest.java
index 832a808..577cec7 100644
--- a/src/test/java/org/apache/commons/math4/dfp/DfpMathTest.java
+++ b/src/test/java/org/apache/commons/math4/dfp/DfpMathTest.java
@@ -15,8 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.dfp;
+package org.apache.commons.math4.dfp;
 
+import org.apache.commons.math4.dfp.Dfp;
+import org.apache.commons.math4.dfp.DfpField;
+import org.apache.commons.math4.dfp.DfpMath;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/dfp/DfpTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/dfp/DfpTest.java 
b/src/test/java/org/apache/commons/math4/dfp/DfpTest.java
index 236dd79..9725f36 100644
--- a/src/test/java/org/apache/commons/math4/dfp/DfpTest.java
+++ b/src/test/java/org/apache/commons/math4/dfp/DfpTest.java
@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.dfp;
+package org.apache.commons.math4.dfp;
 
-import org.apache.commons.math3.ExtendedFieldElementAbstractTest;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.ExtendedFieldElementAbstractTest;
+import org.apache.commons.math4.dfp.Dfp;
+import org.apache.commons.math4.dfp.DfpField;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Precision;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/AbstractIntegerDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/AbstractIntegerDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/AbstractIntegerDistributionTest.java
index 6e140eb..52e9680 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/AbstractIntegerDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/AbstractIntegerDistributionTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
+import org.apache.commons.math4.distribution.AbstractIntegerDistribution;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/AbstractRealDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/AbstractRealDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/AbstractRealDistributionTest.java
index 88ea98d..d0b2761 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/AbstractRealDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/AbstractRealDistributionTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.integration.RombergIntegrator;
-import org.apache.commons.math3.analysis.integration.UnivariateIntegrator;
-import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.integration.RombergIntegrator;
+import org.apache.commons.math4.analysis.integration.UnivariateIntegrator;
+import org.apache.commons.math4.distribution.AbstractRealDistribution;
+import org.apache.commons.math4.exception.OutOfRangeException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/BetaDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/BetaDistributionTest.java 
b/src/test/java/org/apache/commons/math4/distribution/BetaDistributionTest.java
index 217ae66..9c64cf9 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/BetaDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/BetaDistributionTest.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
+import org.apache.commons.math4.distribution.BetaDistribution;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/BinomialDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/BinomialDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/BinomialDistributionTest.java
index d6cb294..660750e 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/BinomialDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/BinomialDistributionTest.java
@@ -11,8 +11,10 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
+import org.apache.commons.math4.distribution.BinomialDistribution;
+import org.apache.commons.math4.distribution.IntegerDistribution;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/CauchyDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/CauchyDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/CauchyDistributionTest.java
index 1cfa3df..86bd0e4 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/CauchyDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/CauchyDistributionTest.java
@@ -15,9 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.distribution.CauchyDistribution;
+import org.apache.commons.math4.distribution.NormalDistribution;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/ChiSquaredDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/ChiSquaredDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/ChiSquaredDistributionTest.java
index f8bae6a..fc1ab85 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/ChiSquaredDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/ChiSquaredDistributionTest.java
@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
+import org.apache.commons.math4.distribution.ChiSquaredDistribution;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/ConstantRealDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/ConstantRealDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/ConstantRealDistributionTest.java
index 1f3edb7..6a7bbe8 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/ConstantRealDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/ConstantRealDistributionTest.java
@@ -15,8 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
+import org.apache.commons.math4.distribution.ConstantRealDistribution;
+import org.apache.commons.math4.distribution.RealDistribution;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/EnumeratedIntegerDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/EnumeratedIntegerDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/EnumeratedIntegerDistributionTest.java
index dd3d069..48be05e 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/EnumeratedIntegerDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/EnumeratedIntegerDistributionTest.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.exception.MathArithmeticException;
-import org.apache.commons.math3.exception.NotANumberException;
-import org.apache.commons.math3.exception.NotFiniteNumberException;
-import org.apache.commons.math3.exception.NotPositiveException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.distribution.EnumeratedIntegerDistribution;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.MathArithmeticException;
+import org.apache.commons.math4.exception.NotANumberException;
+import org.apache.commons.math4.exception.NotFiniteNumberException;
+import org.apache.commons.math4.exception.NotPositiveException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/EnumeratedRealDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/EnumeratedRealDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/EnumeratedRealDistributionTest.java
index 961b134..af8aed3 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/EnumeratedRealDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/EnumeratedRealDistributionTest.java
@@ -14,20 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.exception.MathArithmeticException;
-import org.apache.commons.math3.exception.NotANumberException;
-import org.apache.commons.math3.exception.NotFiniteNumberException;
-import org.apache.commons.math3.exception.NotPositiveException;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.util.Pair;
+import org.apache.commons.math4.distribution.EnumeratedDistribution;
+import org.apache.commons.math4.distribution.EnumeratedRealDistribution;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.MathArithmeticException;
+import org.apache.commons.math4.exception.NotANumberException;
+import org.apache.commons.math4.exception.NotFiniteNumberException;
+import org.apache.commons.math4.exception.NotPositiveException;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Pair;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/ExponentialDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/ExponentialDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/ExponentialDistributionTest.java
index 35d6e60..ea1a14f 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/ExponentialDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/ExponentialDistributionTest.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.util.Precision;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.distribution.ExponentialDistribution;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/FDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/FDistributionTest.java 
b/src/test/java/org/apache/commons/math4/distribution/FDistributionTest.java
index fe617ca..21ae3ca 100644
--- a/src/test/java/org/apache/commons/math4/distribution/FDistributionTest.java
+++ b/src/test/java/org/apache/commons/math4/distribution/FDistributionTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.distribution.FDistribution;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/GammaDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/GammaDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/GammaDistributionTest.java
index 6f5fa38..c217b9c 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/GammaDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/GammaDistributionTest.java
@@ -15,17 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.special.Gamma;
-import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.distribution.GammaDistribution;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.special.Gamma;
+import org.apache.commons.math4.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -215,7 +216,7 @@ public class GammaDistributionTest extends 
RealDistributionAbstractTest {
      * MATH-753: large values of x or shape parameter cause density(double) to
      * overflow. Reference data is generated with the Maxima script
      * gamma-distribution.mac, which can be found in
-     * src/test/resources/org/apache/commons/math3/distribution.
+     * src/test/resources/org/apache/commons/math4/distribution.
      */
 
     private void doTestMath753(final double shape,

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/GeometricDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/GeometricDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/GeometricDistributionTest.java
index a3def55..ba35153 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/GeometricDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/GeometricDistributionTest.java
@@ -11,8 +11,10 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
+import org.apache.commons.math4.distribution.GeometricDistribution;
+import org.apache.commons.math4.distribution.IntegerDistribution;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/GumbelDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/GumbelDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/GumbelDistributionTest.java
index c5bd075..7a06926 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/GumbelDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/GumbelDistributionTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.distribution.GumbelDistribution;
+import org.apache.commons.math4.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/HypergeometricDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/HypergeometricDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/HypergeometricDistributionTest.java
index a5adbc2..b9b791c 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/HypergeometricDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/HypergeometricDistributionTest.java
@@ -15,13 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.TestUtils;
-import org.apache.commons.math3.exception.NotPositiveException;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.TestUtils;
+import org.apache.commons.math4.distribution.HypergeometricDistribution;
+import org.apache.commons.math4.distribution.IntegerDistribution;
+import org.apache.commons.math4.exception.NotPositiveException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/IntegerDistributionAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/IntegerDistributionAbstractTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/IntegerDistributionAbstractTest.java
index f85b4b2..895428d 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/IntegerDistributionAbstractTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/IntegerDistributionAbstractTest.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.TestUtils;
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.TestUtils;
+import org.apache.commons.math4.distribution.AbstractIntegerDistribution;
+import org.apache.commons.math4.distribution.IntegerDistribution;
+import org.apache.commons.math4.exception.MathIllegalArgumentException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/KolmogorovSmirnovDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/KolmogorovSmirnovDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/KolmogorovSmirnovDistributionTest.java
index 53f4ff8..eb472b7 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/KolmogorovSmirnovDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/KolmogorovSmirnovDistributionTest.java
@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
+import org.apache.commons.math4.distribution.KolmogorovSmirnovDistribution;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/LaplaceDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/LaplaceDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/LaplaceDistributionTest.java
index eae9287..55ea7df 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/LaplaceDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/LaplaceDistributionTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.distribution.LaplaceDistribution;
+import org.apache.commons.math4.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/LevyDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/LevyDistributionTest.java 
b/src/test/java/org/apache/commons/math4/distribution/LevyDistributionTest.java
index 3c32b9e..59c2d7c 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/LevyDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/LevyDistributionTest.java
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.random.Well19937a;
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.distribution.LevyDistribution;
+import org.apache.commons.math4.random.Well19937a;
+import org.apache.commons.math4.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/LogNormalDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/LogNormalDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/LogNormalDistributionTest.java
index af45686..2ea431d 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/LogNormalDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/LogNormalDistributionTest.java
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.distribution.LogNormalDistribution;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/LogisticsDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/LogisticsDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/LogisticsDistributionTest.java
index 9caf8d5..b43daac 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/LogisticsDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/LogisticsDistributionTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.distribution.LogisticDistribution;
+import org.apache.commons.math4.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/MultivariateNormalDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/MultivariateNormalDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/MultivariateNormalDistributionTest.java
index f044cbd..cd4a497 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/MultivariateNormalDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/MultivariateNormalDistributionTest.java
@@ -15,12 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.stat.correlation.Covariance;
-import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math4.distribution.MultivariateNormalDistribution;
+import org.apache.commons.math4.distribution.NormalDistribution;
+import org.apache.commons.math4.linear.RealMatrix;
+import org.apache.commons.math4.stat.correlation.Covariance;
 
 import java.util.Random;
+
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/MultivariateNormalMixtureModelDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/MultivariateNormalMixtureModelDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/MultivariateNormalMixtureModelDistributionTest.java
index 12a23c2..8bed770 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/MultivariateNormalMixtureModelDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/MultivariateNormalMixtureModelDistributionTest.java
@@ -14,13 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
 import java.util.List;
 import java.util.ArrayList;
-import org.apache.commons.math3.exception.NotPositiveException;
-import org.apache.commons.math3.exception.MathArithmeticException;
-import org.apache.commons.math3.util.Pair;
+
+import 
org.apache.commons.math4.distribution.MixtureMultivariateRealDistribution;
+import org.apache.commons.math4.distribution.MultivariateNormalDistribution;
+import org.apache.commons.math4.exception.MathArithmeticException;
+import org.apache.commons.math4.exception.NotPositiveException;
+import org.apache.commons.math4.util.Pair;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/NakagamiDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/NakagamiDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/NakagamiDistributionTest.java
index 10f7073..aa7e927 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/NakagamiDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/NakagamiDistributionTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.distribution.NakagamiDistribution;
+import org.apache.commons.math4.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/NormalDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/NormalDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/NormalDistributionTest.java
index 5a7597b..3ced97c 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/NormalDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/NormalDistributionTest.java
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.distribution.NormalDistribution;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/ParetoDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/ParetoDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/ParetoDistributionTest.java
index b7fe74d..0c5d488 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/ParetoDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/ParetoDistributionTest.java
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.distribution.ParetoDistribution;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/PascalDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/PascalDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/PascalDistributionTest.java
index e876232..6f2725e 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/PascalDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/PascalDistributionTest.java
@@ -14,8 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
+import org.apache.commons.math4.distribution.IntegerDistribution;
+import org.apache.commons.math4.distribution.NormalDistribution;
+import org.apache.commons.math4.distribution.PascalDistribution;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/PoissonDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/PoissonDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/PoissonDistributionTest.java
index 63518d2..51d6252 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/PoissonDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/PoissonDistributionTest.java
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.distribution.IntegerDistribution;
+import org.apache.commons.math4.distribution.PoissonDistribution;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/RealDistributionAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/RealDistributionAbstractTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/RealDistributionAbstractTest.java
index 4fa94a9..5d1af10 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/RealDistributionAbstractTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/RealDistributionAbstractTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
 
 import java.util.ArrayList;
@@ -25,13 +25,15 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.apache.commons.math3.TestUtils;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import 
org.apache.commons.math3.analysis.integration.BaseAbstractUnivariateIntegrator;
-import 
org.apache.commons.math3.analysis.integration.IterativeLegendreGaussIntegrator;
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.TestUtils;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import 
org.apache.commons.math4.analysis.integration.BaseAbstractUnivariateIntegrator;
+import 
org.apache.commons.math4.analysis.integration.IterativeLegendreGaussIntegrator;
+import org.apache.commons.math4.distribution.AbstractRealDistribution;
+import org.apache.commons.math4.distribution.RealDistribution;
+import org.apache.commons.math4.exception.MathIllegalArgumentException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.util.FastMath;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/TDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/TDistributionTest.java 
b/src/test/java/org/apache/commons/math4/distribution/TDistributionTest.java
index 2f50b70..0279394 100644
--- a/src/test/java/org/apache/commons/math4/distribution/TDistributionTest.java
+++ b/src/test/java/org/apache/commons/math4/distribution/TDistributionTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math4.TestUtils;
+import org.apache.commons.math4.distribution.TDistribution;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
 /**
  * Test cases for TDistribution.
  * Extends ContinuousDistributionAbstractTest.  See class javadoc for

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/TriangularDistributionTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/math4/distribution/TriangularDistributionTest.java
 
b/src/test/java/org/apache/commons/math4/distribution/TriangularDistributionTest.java
index 762a79b..d8027e7 100644
--- 
a/src/test/java/org/apache/commons/math4/distribution/TriangularDistributionTest.java
+++ 
b/src/test/java/org/apache/commons/math4/distribution/TriangularDistributionTest.java
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.distribution;
+package org.apache.commons.math4.distribution;
 
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math4.distribution.TriangularDistribution;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
 import org.junit.Assert;
 import org.junit.Test;
 

Reply via email to