clean up and restructurings

16 files changed, 16 insertions, 16 deletions

diff --git a/test_polymatrix/test_expression/test_addition.py b/test_polymatrix/test_expression/test_addition.py
index 623b13f..6c8a9a2 100644
--- a/test_polymatrix/test_expression/test_addition.py
+++ b/test_polymatrix/test_expression/test_addition.py
@@ -1,7 +1,7 @@
 import unittest
 
 from polymatrix.expression.init.initadditionexpr import init_addition_expr
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 
 
diff --git a/test_polymatrix/test_expression/test_blockdiag.py b/test_polymatrix/test_expression/test_blockdiag.py
index 69141a4..a66935e 100644
--- a/test_polymatrix/test_expression/test_blockdiag.py
+++ b/test_polymatrix/test_expression/test_blockdiag.py
@@ -1,7 +1,7 @@
 import unittest
 
 from polymatrix.expression.init.initblockdiagexpr import init_block_diag_expr
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 
 
diff --git a/test_polymatrix/test_expression/test_derivative.py b/test_polymatrix/test_expression/test_derivative.py
index a4fc6f6..93c98f4 100644
--- a/test_polymatrix/test_expression/test_derivative.py
+++ b/test_polymatrix/test_expression/test_derivative.py
@@ -2,7 +2,7 @@ import unittest
 from polymatrix.expression.init.initderivativeexpr import init_derivative_expr
 from polymatrix.expression.init.initdivergenceexpr import init_divergence_expr
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initlinearinexpr import init_linear_in_expr
 
diff --git a/test_polymatrix/test_expression/test_divergence.py b/test_polymatrix/test_expression/test_divergence.py
index 412dcca..ad25577 100644
--- a/test_polymatrix/test_expression/test_divergence.py
+++ b/test_polymatrix/test_expression/test_divergence.py
@@ -1,7 +1,7 @@
 import unittest
 from polymatrix.expression.init.initdivergenceexpr import init_divergence_expr
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initlinearinexpr import init_linear_in_expr
 
diff --git a/test_polymatrix/test_expression/test_eval.py b/test_polymatrix/test_expression/test_eval.py
index 662322a..9b9454f 100644
--- a/test_polymatrix/test_expression/test_eval.py
+++ b/test_polymatrix/test_expression/test_eval.py
@@ -1,7 +1,7 @@
 import unittest
 
 from polymatrix.expression.init.initevalexpr import init_eval_expr
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 
 
diff --git a/test_polymatrix/test_expression/test_linearin.py b/test_polymatrix/test_expression/test_linearin.py
index 67f2c3d..53d324a 100644
--- a/test_polymatrix/test_expression/test_linearin.py
+++ b/test_polymatrix/test_expression/test_linearin.py
@@ -1,6 +1,6 @@
 import unittest
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initlinearinexpr import init_linear_in_expr
 
diff --git a/test_polymatrix/test_expression/test_matrixmult.py b/test_polymatrix/test_expression/test_matrixmult.py
index 6facb48..12d0584 100644
--- a/test_polymatrix/test_expression/test_matrixmult.py
+++ b/test_polymatrix/test_expression/test_matrixmult.py
@@ -1,6 +1,6 @@
 import unittest
 from polymatrix.expression.init.initadditionexpr import init_addition_expr
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initmatrixmultexpr import init_matrix_mult_expr
diff --git a/test_polymatrix/test_expression/test_quadraticin.py b/test_polymatrix/test_expression/test_quadraticin.py
index c340d7f..f25d8be 100644
--- a/test_polymatrix/test_expression/test_quadraticin.py
+++ b/test_polymatrix/test_expression/test_quadraticin.py
@@ -1,6 +1,6 @@
 import unittest
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initquadraticinexpr import init_quadratic_in_expr
 
diff --git a/test_polymatrix/test_expression/test_substitude.py b/test_polymatrix/test_expression/test_substitude.py
index 9a6e875..21a8ab5 100644
--- a/test_polymatrix/test_expression/test_substitude.py
+++ b/test_polymatrix/test_expression/test_substitude.py
@@ -1,6 +1,6 @@
 import unittest
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initsubstituteexpr import init_substitute_expr
 
diff --git a/test_polymatrix/test_expression/test_subtractmonomials.py b/test_polymatrix/test_expression/test_subtractmonomials.py
index f80f76a..8cd8585 100644
--- a/test_polymatrix/test_expression/test_subtractmonomials.py
+++ b/test_polymatrix/test_expression/test_subtractmonomials.py
@@ -2,7 +2,7 @@ import unittest
 from polymatrix.expression.init.initderivativeexpr import init_derivative_expr
 from polymatrix.expression.init.initdivergenceexpr import init_divergence_expr
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initlinearinexpr import init_linear_in_expr
 from polymatrix.expression.init.initsubtractmonomialsexpr import init_subtract_monomials_expr
diff --git a/test_polymatrix/test_expression/test_sum.py b/test_polymatrix/test_expression/test_sum.py
index 48ae073..053e428 100644
--- a/test_polymatrix/test_expression/test_sum.py
+++ b/test_polymatrix/test_expression/test_sum.py
@@ -1,7 +1,7 @@
 import unittest
 
 from polymatrix.expression.init.initevalexpr import init_eval_expr
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initsumexpr import init_sum_expr
 
diff --git a/test_polymatrix/test_expression/test_symmetric.py b/test_polymatrix/test_expression/test_symmetric.py
index ac5eba6..a93d975 100644
--- a/test_polymatrix/test_expression/test_symmetric.py
+++ b/test_polymatrix/test_expression/test_symmetric.py
@@ -1,6 +1,6 @@
 import unittest
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initquadraticinexpr import init_quadratic_in_expr
 from polymatrix.expression.init.initsymmetricexpr import init_symmetric_expr
diff --git a/test_polymatrix/test_expression/test_toconstant.py b/test_polymatrix/test_expression/test_toconstant.py
index 784aeec..f3a0643 100644
--- a/test_polymatrix/test_expression/test_toconstant.py
+++ b/test_polymatrix/test_expression/test_toconstant.py
@@ -1,6 +1,6 @@
 import unittest
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initquadraticinexpr import init_quadratic_in_expr
 from polymatrix.expression.init.initsymmetricexpr import init_symmetric_expr
diff --git a/test_polymatrix/test_expression/test_truncate.py b/test_polymatrix/test_expression/test_truncate.py
index e944229..910bd37 100644
--- a/test_polymatrix/test_expression/test_truncate.py
+++ b/test_polymatrix/test_expression/test_truncate.py
@@ -1,6 +1,6 @@
 import unittest
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initquadraticinexpr import init_quadratic_in_expr
 from polymatrix.expression.init.initsymmetricexpr import init_symmetric_expr
diff --git a/test_polymatrix/test_expression/test_vstack.py b/test_polymatrix/test_expression/test_vstack.py
index a50267f..8778f8a 100644
--- a/test_polymatrix/test_expression/test_vstack.py
+++ b/test_polymatrix/test_expression/test_vstack.py
@@ -1,6 +1,6 @@
 import unittest
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initvstackexpr import init_v_stack_expr
 
diff --git a/test_polymatrix/test_tomatrixrepr.py b/test_polymatrix/test_tomatrixrepr.py
index 7486c8e..181f6fa 100644
--- a/test_polymatrix/test_tomatrixrepr.py
+++ b/test_polymatrix/test_tomatrixrepr.py
@@ -1,7 +1,7 @@
 import unittest
 import polymatrix
 
-from polymatrix.expression.init.initexpressionstate import init_expression_state
+from polymatrix.expressionstate.init.initexpressionstate import init_expression_state
 from polymatrix.expression.init.initfromtermsexpr import init_from_terms_expr
 from polymatrix.expression.init.initlinearinexpr import init_linear_in_expr