diff --git a/.travis.yml b/.travis.yml
index 7b046482f..45e90e985 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ install:
   # We thrown away the existing repo in Docker, and copy the new one in-place
   - docker exec -it app /bin/bash -c "rm -rf $DOCKER_WORKING_DIR && cp -r $DOCKER_MOUNT_DIR $DOCKER_WORKING_DIR"
   # Now download the regression input files
-  - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/python && wget http://mdolab.engin.umich.edu/sites/default/files/mdolabwebsite/repos/adflow/adflow_input_files.tar.gz && tar -xzf adflow_input_files.tar.gz"
+  - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && wget http://mdolab.engin.umich.edu/sites/default/files/mdolabwebsite/repos/adflow/adflow_input_files.tar.gz && tar -xzf adflow_input_files.tar.gz"
   # Copy over the correct config file and modify as needed
   - if [[ "$DOCKER_TAG" == "py3-centos7-impi" ]]; then
       docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && cp config/defaults/config.LINUX_INTEL.mk config/config.mk";
@@ -55,14 +55,16 @@ install:
     else
       docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && make -f Makefile_CS PETSC_ARCH=complex-opt-\$COMPILERS-\$PETSCVERSION";
     fi
+  # Install Python interface
+  - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && pip install ."
 
 script:
   # Some of the complex tests take >10 min, so adding travis_wait to stop travis from timing out after 10min
   # the sleep infinity is a workaround since docker exec forks another process which won't work directly with travis_wait
   - if [ "$TEST_TYPE" = "REAL" ]; then
-      travis_wait 120 sleep infinity & docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/python/reg_tests && python run_reg_tests.py";
+      travis_wait 120 sleep infinity & docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/reg_tests && python run_reg_tests.py";
     else
-      travis_wait 120 sleep infinity & docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/python/reg_tests && export PETSC_ARCH=complex-opt-\$COMPILERS-\$PETSCVERSION && python run_reg_tests_cs.py";
+      travis_wait 120 sleep infinity & docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/reg_tests && export PETSC_ARCH=complex-opt-\$COMPILERS-\$PETSCVERSION && python run_reg_tests_cs.py";
     fi
 
 after_script:
diff --git a/Makefile b/Makefile
index 5769d4c59..60c05126d 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ default:
 	echo "The modify this config file as required. Typically the CGNS directory "; \
 	echo "will have to be modified. With the config file specified, rerun "; \
 	echo "'make' and the build will start"; \
-	else make adflow;\
+	else make adflow_build;\
 	fi;
 
 clean:
@@ -26,7 +26,7 @@ clean:
 
 
 
-adflow:
+adflow_build:
 	ln -sf config/config.mk config.mk;
 	(cd src/build/ && make)
 
diff --git a/Makefile_CS b/Makefile_CS
index 9132db5fc..614658ff4 100644
--- a/Makefile_CS
+++ b/Makefile_CS
@@ -12,7 +12,7 @@ default:
 	echo "The modify this config file as required. Typically the CGNS directory "; \
 	echo "will have to be modified. With the config file specified, rerun "; \
 	echo "'make' and the build will start"; \
-	else make -f Makefile_CS adflow;\
+	else make -f Makefile_CS adflow_build;\
 	fi;
 
 
@@ -41,7 +41,7 @@ clean:
 	rm -fr src_cs/wallDistance
 	rm -fr src_cs/warping
 
-adflow:
+adflow_build:
 	ln -sf config/config.mk config.mk;
 	(cd src_cs/build/ && make -f Makefile1 directories)
 	(cd src_cs/build/ && make -f Makefile1 complexify)
diff --git a/python/MExt.py b/adflow/MExt.py
similarity index 100%
rename from python/MExt.py
rename to adflow/MExt.py
diff --git a/__init__.py b/adflow/__init__.py
similarity index 55%
rename from __init__.py
rename to adflow/__init__.py
index 9e12bc7c5..119434f67 100644
--- a/__init__.py
+++ b/adflow/__init__.py
@@ -1,9 +1,11 @@
+__version__ = '2.2.0'
+
 from mpi4py import MPI
 
-from .python.pyADflow import ADFLOW
-from .python.pyADflow_C import ADFLOW_C
-from .python.oversetCheck import OversetCheck
-from .python.checkZipper import checkZipper
+from .pyADflow import ADFLOW
+from .pyADflow_C import ADFLOW_C
+from .oversetCheck import OversetCheck
+from .checkZipper import checkZipper
 
 
 try: 
@@ -15,7 +17,7 @@
         print('Warning: OpenMDAO dependency is not installed. OM_ADFLOW wrapper will not be active')
 
 if openmdao is not None: 
-    from .python.om_adflow import OM_ADFLOW
+    from .om_adflow import OM_ADFLOW
 
 
 
diff --git a/python/checkZipper.py b/adflow/checkZipper.py
similarity index 100%
rename from python/checkZipper.py
rename to adflow/checkZipper.py
diff --git a/python/om_adflow.py b/adflow/om_adflow.py
similarity index 100%
rename from python/om_adflow.py
rename to adflow/om_adflow.py
diff --git a/python/om_func_comp.py b/adflow/om_func_comp.py
similarity index 100%
rename from python/om_func_comp.py
rename to adflow/om_func_comp.py
diff --git a/python/om_geocon_comp.py b/adflow/om_geocon_comp.py
similarity index 100%
rename from python/om_geocon_comp.py
rename to adflow/om_geocon_comp.py
diff --git a/python/om_states_comp.py b/adflow/om_states_comp.py
similarity index 100%
rename from python/om_states_comp.py
rename to adflow/om_states_comp.py
diff --git a/python/om_utils.py b/adflow/om_utils.py
similarity index 100%
rename from python/om_utils.py
rename to adflow/om_utils.py
diff --git a/python/oversetCheck.py b/adflow/oversetCheck.py
similarity index 100%
rename from python/oversetCheck.py
rename to adflow/oversetCheck.py
diff --git a/python/pyADflow.py b/adflow/pyADflow.py
similarity index 100%
rename from python/pyADflow.py
rename to adflow/pyADflow.py
diff --git a/python/pyADflow_C.py b/adflow/pyADflow_C.py
similarity index 100%
rename from python/pyADflow_C.py
rename to adflow/pyADflow_C.py
diff --git a/python/pyDynamicPerformance.py b/adflow/pyDynamicPerformance.py
similarity index 100%
rename from python/pyDynamicPerformance.py
rename to adflow/pyDynamicPerformance.py
diff --git a/python/pyPerformanceClass.py b/adflow/pyPerformanceClass.py
similarity index 100%
rename from python/pyPerformanceClass.py
rename to adflow/pyPerformanceClass.py
diff --git a/python/pyWeightAndBalance.py b/adflow/pyWeightAndBalance.py
similarity index 100%
rename from python/pyWeightAndBalance.py
rename to adflow/pyWeightAndBalance.py
diff --git a/python/pyWingCG.py b/adflow/pyWingCG.py
similarity index 100%
rename from python/pyWingCG.py
rename to adflow/pyWingCG.py
diff --git a/doc/install.rst b/doc/install.rst
index d0b93b03e..4b91ac1c5 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -7,7 +7,12 @@ It is therefore necessary to build this library before using ``ADflow``.
 
 Requirements
 ------------
-See :ref:`install3rdPartyPackages` for details on installing required 3rd party packages.
+ADflow requires the following dependencies:
+- CGNS Library
+- PETSc
+- MPI
+
+See the MDO Lab installation guide `here <http://mdolab.engin.umich.edu/docs/installInstructions/install3rdPartyPackages.html>`_ for the supported versions and installation instructions.
 
 Building
 --------
@@ -24,7 +29,7 @@ If you are a beginner user installing the packages on a linux desktop,
 you should use the ``config.LINUX_GFORTRAN`` versions of the configuration 
 files. The ``config.LINUX_INTEL`` versions are usually used on clusters.
 ADflow has been successfully compiled on LINUX with either
-ifort or gfortran.
+``ifort`` or ``gfortran``.
 
 Once you have copied the config file, compile ADflow by running::
 
@@ -36,13 +41,17 @@ the screen (near the end)::
    Testing if module adflow can be imported...
    Module adflow was successfully imported.
 
-If you don't see this, it will be necessary to configure the build
-manually. To configure manually, open ``config/config.mk`` and modify options as necessary.
+If you don't see this, it will be necessary to configure the build manually.
+To configure manually, open ``config/config.mk`` and modify options as necessary.
 
 It is most likely that you need to modify the ``CGNS_INCLUDE_FLAGS`` and the ``CGNS_LINKER_FLAGS`` variables.
-It is also necessary to have``PETSc`` already compiled. 
 After changes to the configuration file, run ``make clean`` before attempting a new build.
 
+Lastly, to build and install the Python interface, type::
+
+    pip install .
+
+
 Verification
 ------------
 ADflow contains a set of simple tests that can be run automatically
diff --git a/python/examples/numOfProcsLB.py b/examples/numOfProcsLB.py
similarity index 100%
rename from python/examples/numOfProcsLB.py
rename to examples/numOfProcsLB.py
diff --git a/python/inputFiles/Readme.md b/inputFiles/Readme.md
similarity index 59%
rename from python/inputFiles/Readme.md
rename to inputFiles/Readme.md
index c7131325c..53bf6e492 100644
--- a/python/inputFiles/Readme.md
+++ b/inputFiles/Readme.md
@@ -2,11 +2,9 @@
 
 The input files for test need to be downloaded.
 
-From the command line, navigate to the `adflow/python` directory and download and extract the archive
+From the command line, navigate to the root directory and download and extract the archive
 
-```
 wget http://mdolab.engin.umich.edu/sites/default/files/mdolabwebsite/repos/adflow/adflow_input_files.tar.gz
 tar -xzvf adflow_input_files.tar.gz 
-```
 
-The above should extract the files to the `adflow/python/inputFiles` directory.
\ No newline at end of file
+The above should extract the files to the root directory.
diff --git a/python/__init__.py b/reg_tests/adflow_reg.ref
similarity index 100%
rename from python/__init__.py
rename to reg_tests/adflow_reg.ref
diff --git a/python/reg_tests/commonUtils.py b/reg_tests/commonUtils.py
similarity index 100%
rename from python/reg_tests/commonUtils.py
rename to reg_tests/commonUtils.py
diff --git a/python/reg_tests/mdo_regression_compare.py b/reg_tests/mdo_regression_compare.py
similarity index 100%
rename from python/reg_tests/mdo_regression_compare.py
rename to reg_tests/mdo_regression_compare.py
diff --git a/python/reg_tests/mdo_regression_helper.py b/reg_tests/mdo_regression_helper.py
similarity index 100%
rename from python/reg_tests/mdo_regression_helper.py
rename to reg_tests/mdo_regression_helper.py
diff --git a/python/reg_tests/om_commonUtils.py b/reg_tests/om_commonUtils.py
similarity index 100%
rename from python/reg_tests/om_commonUtils.py
rename to reg_tests/om_commonUtils.py
diff --git a/python/reg_tests/om_tests/__init__.py b/reg_tests/om_tests/__init__.py
similarity index 100%
rename from python/reg_tests/om_tests/__init__.py
rename to reg_tests/om_tests/__init__.py
diff --git a/python/reg_tests/om_tests/test_adjoint_compare.py b/reg_tests/om_tests/test_adjoint_compare.py
similarity index 100%
rename from python/reg_tests/om_tests/test_adjoint_compare.py
rename to reg_tests/om_tests/test_adjoint_compare.py
diff --git a/python/reg_tests/om_tests/test_sol_compare.py b/reg_tests/om_tests/test_sol_compare.py
similarity index 100%
rename from python/reg_tests/om_tests/test_sol_compare.py
rename to reg_tests/om_tests/test_sol_compare.py
diff --git a/python/reg_tests/om_tests/test_std_compare.py b/reg_tests/om_tests/test_std_compare.py
similarity index 100%
rename from python/reg_tests/om_tests/test_std_compare.py
rename to reg_tests/om_tests/test_std_compare.py
diff --git a/python/reg_tests/ref/adflow_test10_reg.ref b/reg_tests/ref/adflow_test10_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test10_reg.ref
rename to reg_tests/ref/adflow_test10_reg.ref
diff --git a/python/reg_tests/ref/adflow_test11_reg.ref b/reg_tests/ref/adflow_test11_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test11_reg.ref
rename to reg_tests/ref/adflow_test11_reg.ref
diff --git a/python/reg_tests/ref/adflow_test12_reg.ref b/reg_tests/ref/adflow_test12_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test12_reg.ref
rename to reg_tests/ref/adflow_test12_reg.ref
diff --git a/python/reg_tests/ref/adflow_test13_reg.ref b/reg_tests/ref/adflow_test13_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test13_reg.ref
rename to reg_tests/ref/adflow_test13_reg.ref
diff --git a/python/reg_tests/ref/adflow_test14_reg.ref b/reg_tests/ref/adflow_test14_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test14_reg.ref
rename to reg_tests/ref/adflow_test14_reg.ref
diff --git a/python/reg_tests/ref/adflow_test15_reg.ref b/reg_tests/ref/adflow_test15_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test15_reg.ref
rename to reg_tests/ref/adflow_test15_reg.ref
diff --git a/python/reg_tests/ref/adflow_test16_reg.ref b/reg_tests/ref/adflow_test16_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test16_reg.ref
rename to reg_tests/ref/adflow_test16_reg.ref
diff --git a/python/reg_tests/ref/adflow_test17_reg.ref b/reg_tests/ref/adflow_test17_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test17_reg.ref
rename to reg_tests/ref/adflow_test17_reg.ref
diff --git a/python/reg_tests/ref/adflow_test18_reg.ref b/reg_tests/ref/adflow_test18_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test18_reg.ref
rename to reg_tests/ref/adflow_test18_reg.ref
diff --git a/python/reg_tests/ref/adflow_test1_reg.ref b/reg_tests/ref/adflow_test1_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test1_reg.ref
rename to reg_tests/ref/adflow_test1_reg.ref
diff --git a/python/reg_tests/ref/adflow_test2_reg.ref b/reg_tests/ref/adflow_test2_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test2_reg.ref
rename to reg_tests/ref/adflow_test2_reg.ref
diff --git a/python/reg_tests/ref/adflow_test3_reg.ref b/reg_tests/ref/adflow_test3_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test3_reg.ref
rename to reg_tests/ref/adflow_test3_reg.ref
diff --git a/python/reg_tests/ref/adflow_test4_reg.ref b/reg_tests/ref/adflow_test4_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test4_reg.ref
rename to reg_tests/ref/adflow_test4_reg.ref
diff --git a/python/reg_tests/ref/adflow_test5_reg.ref b/reg_tests/ref/adflow_test5_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test5_reg.ref
rename to reg_tests/ref/adflow_test5_reg.ref
diff --git a/python/reg_tests/ref/adflow_test6_reg.ref b/reg_tests/ref/adflow_test6_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test6_reg.ref
rename to reg_tests/ref/adflow_test6_reg.ref
diff --git a/python/reg_tests/ref/adflow_test7_reg.ref b/reg_tests/ref/adflow_test7_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test7_reg.ref
rename to reg_tests/ref/adflow_test7_reg.ref
diff --git a/python/reg_tests/ref/adflow_test8_reg.ref b/reg_tests/ref/adflow_test8_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test8_reg.ref
rename to reg_tests/ref/adflow_test8_reg.ref
diff --git a/python/reg_tests/ref/adflow_test9_reg.ref b/reg_tests/ref/adflow_test9_reg.ref
similarity index 100%
rename from python/reg_tests/ref/adflow_test9_reg.ref
rename to reg_tests/ref/adflow_test9_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test1_reg.ref b/reg_tests/ref_cs/adflow_test1_reg.ref
similarity index 100%
rename from python/reg_tests/ref_cs/adflow_test1_reg.ref
rename to reg_tests/ref_cs/adflow_test1_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test2_reg.ref b/reg_tests/ref_cs/adflow_test2_reg.ref
similarity index 100%
rename from python/reg_tests/ref_cs/adflow_test2_reg.ref
rename to reg_tests/ref_cs/adflow_test2_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test3_reg.ref b/reg_tests/ref_cs/adflow_test3_reg.ref
similarity index 100%
rename from python/reg_tests/ref_cs/adflow_test3_reg.ref
rename to reg_tests/ref_cs/adflow_test3_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test4_reg.ref b/reg_tests/ref_cs/adflow_test4_reg.ref
similarity index 100%
rename from python/reg_tests/ref_cs/adflow_test4_reg.ref
rename to reg_tests/ref_cs/adflow_test4_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test5_reg.ref b/reg_tests/ref_cs/adflow_test5_reg.ref
similarity index 100%
rename from python/reg_tests/ref_cs/adflow_test5_reg.ref
rename to reg_tests/ref_cs/adflow_test5_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test6_reg.ref b/reg_tests/ref_cs/adflow_test6_reg.ref
similarity index 100%
rename from python/reg_tests/ref_cs/adflow_test6_reg.ref
rename to reg_tests/ref_cs/adflow_test6_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test7_reg.ref b/reg_tests/ref_cs/adflow_test7_reg.ref
similarity index 100%
rename from python/reg_tests/ref_cs/adflow_test7_reg.ref
rename to reg_tests/ref_cs/adflow_test7_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test8_reg.ref b/reg_tests/ref_cs/adflow_test8_reg.ref
similarity index 100%
rename from python/reg_tests/ref_cs/adflow_test8_reg.ref
rename to reg_tests/ref_cs/adflow_test8_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test9_reg.ref b/reg_tests/ref_cs/adflow_test9_reg.ref
similarity index 100%
rename from python/reg_tests/ref_cs/adflow_test9_reg.ref
rename to reg_tests/ref_cs/adflow_test9_reg.ref
diff --git a/python/reg_tests/run_om_reg_tests.py b/reg_tests/run_om_reg_tests.py
similarity index 100%
rename from python/reg_tests/run_om_reg_tests.py
rename to reg_tests/run_om_reg_tests.py
diff --git a/python/reg_tests/run_reg_tests.py b/reg_tests/run_reg_tests.py
similarity index 100%
rename from python/reg_tests/run_reg_tests.py
rename to reg_tests/run_reg_tests.py
diff --git a/python/reg_tests/run_reg_tests_cs.py b/reg_tests/run_reg_tests_cs.py
similarity index 100%
rename from python/reg_tests/run_reg_tests_cs.py
rename to reg_tests/run_reg_tests_cs.py
diff --git a/python/reg_tests/tests/__init__.py b/reg_tests/tests/__init__.py
similarity index 100%
rename from python/reg_tests/tests/__init__.py
rename to reg_tests/tests/__init__.py
diff --git a/python/reg_tests/tests/test1.py b/reg_tests/tests/test1.py
similarity index 83%
rename from python/reg_tests/tests/test1.py
rename to reg_tests/tests/test1.py
index a8442d12c..f4627ac69 100644
--- a/python/reg_tests/tests/test1.py
+++ b/reg_tests/tests/test1.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 1: MDO tutorial -- Euler -- Scalar JST')
diff --git a/python/reg_tests/tests/test10.py b/reg_tests/tests/test10.py
similarity index 82%
rename from python/reg_tests/tests/test10.py
rename to reg_tests/tests/test10.py
index 649c2d7cc..eb8d7211d 100644
--- a/python/reg_tests/tests/test10.py
+++ b/reg_tests/tests/test10.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test10: MDO tutorial -- Solve-CL Test')
diff --git a/python/reg_tests/tests/test11.py b/reg_tests/tests/test11.py
similarity index 82%
rename from python/reg_tests/tests/test11.py
rename to reg_tests/tests/test11.py
index 93471d6b3..3ca229e56 100644
--- a/python/reg_tests/tests/test11.py
+++ b/reg_tests/tests/test11.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test11: MDO tutorial -- Viscous -- Solution Test')
diff --git a/python/reg_tests/tests/test12.py b/reg_tests/tests/test12.py
similarity index 83%
rename from python/reg_tests/tests/test12.py
rename to reg_tests/tests/test12.py
index a3966b409..1ca0e045e 100644
--- a/python/reg_tests/tests/test12.py
+++ b/reg_tests/tests/test12.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test12: MDO tutorial -- RANS -- Solution Test')
diff --git a/python/reg_tests/tests/test13.py b/reg_tests/tests/test13.py
similarity index 87%
rename from python/reg_tests/tests/test13.py
rename to reg_tests/tests/test13.py
index 3ca4f91df..6c03347a4 100644
--- a/python/reg_tests/tests/test13.py
+++ b/reg_tests/tests/test13.py
@@ -11,13 +11,7 @@
 from idwarp import USMesh
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test13: MDO tutorial -- Euler -- Adjoint Test')
diff --git a/python/reg_tests/tests/test14.py b/reg_tests/tests/test14.py
similarity index 88%
rename from python/reg_tests/tests/test14.py
rename to reg_tests/tests/test14.py
index 4e821cc75..e7bb42b7b 100644
--- a/python/reg_tests/tests/test14.py
+++ b/reg_tests/tests/test14.py
@@ -11,13 +11,7 @@
 from idwarp import USMesh
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test14: MDO tutorial -- Rans -- Adjoint Test')
diff --git a/python/reg_tests/tests/test15.py b/reg_tests/tests/test15.py
similarity index 90%
rename from python/reg_tests/tests/test15.py
rename to reg_tests/tests/test15.py
index 20be9ec85..a16021168 100644
--- a/python/reg_tests/tests/test15.py
+++ b/reg_tests/tests/test15.py
@@ -8,12 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
+from adflow import ADFLOW
 
 printHeader('Test 15: NACA 0012 2D Time-Accurate, Forced motion, Rigid Rotation of Mesh - DADI Smoother')
 gridFile = '../inputFiles/naca0012_rans-L2.cgns'
diff --git a/python/reg_tests/tests/test16.py b/reg_tests/tests/test16.py
similarity index 92%
rename from python/reg_tests/tests/test16.py
rename to reg_tests/tests/test16.py
index f9da1e00e..dab21b826 100644
--- a/python/reg_tests/tests/test16.py
+++ b/reg_tests/tests/test16.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 16: Euler Convergenent Nozzle -- Flow Properties Integration ')
diff --git a/python/reg_tests/tests/test17.py b/reg_tests/tests/test17.py
similarity index 93%
rename from python/reg_tests/tests/test17.py
rename to reg_tests/tests/test17.py
index c4a7e6109..78f591573 100644
--- a/python/reg_tests/tests/test17.py
+++ b/reg_tests/tests/test17.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ======================================================================
 #         Input Information -- Modify accordingly!
diff --git a/python/reg_tests/tests/test18.py b/reg_tests/tests/test18.py
similarity index 93%
rename from python/reg_tests/tests/test18.py
rename to reg_tests/tests/test18.py
index 770211a74..8130189cf 100644
--- a/python/reg_tests/tests/test18.py
+++ b/reg_tests/tests/test18.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ======================================================================
 #         Input Information -- Modify accordingly!
diff --git a/python/reg_tests/tests/test2.py b/reg_tests/tests/test2.py
similarity index 84%
rename from python/reg_tests/tests/test2.py
rename to reg_tests/tests/test2.py
index 252d97d81..368ddaad3 100644
--- a/python/reg_tests/tests/test2.py
+++ b/reg_tests/tests/test2.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 2: MDO tutorial -- Euler -- Matrix')
diff --git a/python/reg_tests/tests/test3.py b/reg_tests/tests/test3.py
similarity index 83%
rename from python/reg_tests/tests/test3.py
rename to reg_tests/tests/test3.py
index d4cb7c0a4..da71b700d 100644
--- a/python/reg_tests/tests/test3.py
+++ b/reg_tests/tests/test3.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 3: MDO tutorial -- Euler -- Matrix')
diff --git a/python/reg_tests/tests/test4.py b/reg_tests/tests/test4.py
similarity index 83%
rename from python/reg_tests/tests/test4.py
rename to reg_tests/tests/test4.py
index 25cbac257..6ade9bca4 100644
--- a/python/reg_tests/tests/test4.py
+++ b/reg_tests/tests/test4.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 4: MDO tutorial -- Random Mesh -- Euler -- Scalar JST')
diff --git a/python/reg_tests/tests/test5.py b/reg_tests/tests/test5.py
similarity index 83%
rename from python/reg_tests/tests/test5.py
rename to reg_tests/tests/test5.py
index 972cc3a64..79bc486de 100644
--- a/python/reg_tests/tests/test5.py
+++ b/reg_tests/tests/test5.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 5: MDO tutorial -- Viscous -- Scalar JST')
diff --git a/python/reg_tests/tests/test6.py b/reg_tests/tests/test6.py
similarity index 83%
rename from python/reg_tests/tests/test6.py
rename to reg_tests/tests/test6.py
index 6ee2e963b..64a4a89b7 100644
--- a/python/reg_tests/tests/test6.py
+++ b/reg_tests/tests/test6.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 6: MDO tutorial -- Rans -- Scalar JST')
diff --git a/python/reg_tests/tests/test7.py b/reg_tests/tests/test7.py
similarity index 84%
rename from python/reg_tests/tests/test7.py
rename to reg_tests/tests/test7.py
index 7dd4fbe29..0a46d4cfc 100644
--- a/python/reg_tests/tests/test7.py
+++ b/reg_tests/tests/test7.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 7: MDO tutorial -- Random -- Rans -- Scalar JST')
diff --git a/python/reg_tests/tests/test8.py b/reg_tests/tests/test8.py
similarity index 83%
rename from python/reg_tests/tests/test8.py
rename to reg_tests/tests/test8.py
index 2ab2a85fb..34027a7ad 100644
--- a/python/reg_tests/tests/test8.py
+++ b/reg_tests/tests/test8.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 8: CRM WBT -- Euler -- Scalar JST')
diff --git a/python/reg_tests/tests/test9.py b/reg_tests/tests/test9.py
similarity index 82%
rename from python/reg_tests/tests/test9.py
rename to reg_tests/tests/test9.py
index a6f507a7b..c52b15f67 100644
--- a/python/reg_tests/tests/test9.py
+++ b/reg_tests/tests/test9.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test9: MDO tutorial -- Euler -- Solution Test')
diff --git a/python/reg_tests/tests/toAdd/test17.py b/reg_tests/tests/toAdd/test17.py
similarity index 100%
rename from python/reg_tests/tests/toAdd/test17.py
rename to reg_tests/tests/toAdd/test17.py
diff --git a/python/reg_tests/tests/toAdd/test18.py b/reg_tests/tests/toAdd/test18.py
similarity index 100%
rename from python/reg_tests/tests/toAdd/test18.py
rename to reg_tests/tests/toAdd/test18.py
diff --git a/python/reg_tests/tests/toAdd/test19.py b/reg_tests/tests/toAdd/test19.py
similarity index 100%
rename from python/reg_tests/tests/toAdd/test19.py
rename to reg_tests/tests/toAdd/test19.py
diff --git a/python/reg_tests/tests/toAdd/test20.py b/reg_tests/tests/toAdd/test20.py
similarity index 100%
rename from python/reg_tests/tests/toAdd/test20.py
rename to reg_tests/tests/toAdd/test20.py
diff --git a/python/reg_tests/tests_cs/test1.py b/reg_tests/tests_cs/test1.py
similarity index 92%
rename from python/reg_tests/tests_cs/test1.py
rename to reg_tests/tests_cs/test1.py
index d534bd793..04abc365d 100644
--- a/python/reg_tests/tests_cs/test1.py
+++ b/reg_tests/tests_cs/test1.py
@@ -5,21 +5,13 @@
 ############################################################
 import sys, os, copy
 from mpi4py import MPI
-
 from baseclasses import AeroProblem
-
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-
 if 'complex' in sys.argv:
-    from python.pyADflow_C import ADFLOW_C as ADFLOW
+    from adflow import ADFLOW_C as ADFLOW
 else:
-    from python.pyADflow import ADFLOW
+    from adflow import ADFLOW
 # ###################################################################
 
 printHeader('MDO tutorial Euler Mesh - Python functionality testing')
diff --git a/python/reg_tests/tests_cs/test2.py b/reg_tests/tests_cs/test2.py
similarity index 93%
rename from python/reg_tests/tests_cs/test2.py
rename to reg_tests/tests_cs/test2.py
index a7d73a746..8d3119c0f 100644
--- a/python/reg_tests/tests_cs/test2.py
+++ b/reg_tests/tests_cs/test2.py
@@ -5,25 +5,17 @@
 ############################################################
 import sys, os, copy
 from mpi4py import MPI
-
 from baseclasses import AeroProblem
 from pygeo import DVGeometry
 import pyspline
-
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-
 if 'complex' in sys.argv:
-    from python.pyADflow_C import ADFLOW_C as ADFLOW
+    from adflow import ADFLOW_C as ADFLOW
     from pywarp import MBMesh_C as MBMesh
 else:
-    from python.pyADflow import ADFLOW
-    from pywarp import  MBMesh
+    from adflow import ADFLOW
+    from pywarp import MBMesh
 # ###################################################################
 
 # ****************************************************************************
diff --git a/python/reg_tests/tests_cs/test3.py b/reg_tests/tests_cs/test3.py
similarity index 91%
rename from python/reg_tests/tests_cs/test3.py
rename to reg_tests/tests_cs/test3.py
index 751bfeeef..81e7842be 100644
--- a/python/reg_tests/tests_cs/test3.py
+++ b/reg_tests/tests_cs/test3.py
@@ -10,16 +10,10 @@
 
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-
 if 'complex' in sys.argv:
-    from python.pyADflow_C import ADFLOW_C as ADFLOW
+    from adflow import ADFLOW_C as ADFLOW
 else:
-    from python.pyADflow import ADFLOW
+    from adflow import ADFLOW
 
 # ###################################################################
 
diff --git a/python/reg_tests/tests_cs/test4.py b/reg_tests/tests_cs/test4.py
similarity index 93%
rename from python/reg_tests/tests_cs/test4.py
rename to reg_tests/tests_cs/test4.py
index 365ff5598..7c9bc4cba 100644
--- a/python/reg_tests/tests_cs/test4.py
+++ b/reg_tests/tests_cs/test4.py
@@ -5,24 +5,16 @@
 ############################################################
 import sys, os, copy
 from mpi4py import MPI
-
 from baseclasses import AeroProblem
 from pygeo import DVGeometry
 import pyspline
-
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-
 if 'complex' in sys.argv:
-    from python.pyADflow_C import ADFLOW_C as ADFLOW
+    from adflow import ADFLOW_C as ADFLOW
     from pywarp import MBMesh_C as MBMesh
 else:
-    from python.pyADflow import ADFLOW
+    from adflow import ADFLOW
     from pywarp import  MBMesh
 # ###################################################################
 
diff --git a/python/reg_tests/tests_cs/test5.py b/reg_tests/tests_cs/test5.py
similarity index 92%
rename from python/reg_tests/tests_cs/test5.py
rename to reg_tests/tests_cs/test5.py
index d00a98e83..1e6784916 100644
--- a/python/reg_tests/tests_cs/test5.py
+++ b/reg_tests/tests_cs/test5.py
@@ -5,21 +5,13 @@
 ############################################################
 import sys, os, copy
 from mpi4py import MPI
-
 from baseclasses import AeroProblem
-
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-
 if 'complex' in sys.argv:
-    from python.pyADflow_C import ADFLOW_C as ADFLOW
+    from adflow import ADFLOW_C as ADFLOW
 else:
-    from python.pyADflow import ADFLOW
+    from adflow import ADFLOW
 
 # ###################################################################
 
diff --git a/python/reg_tests/tests_cs/test6.py b/reg_tests/tests_cs/test6.py
similarity index 93%
rename from python/reg_tests/tests_cs/test6.py
rename to reg_tests/tests_cs/test6.py
index fd8e42602..2130e759f 100644
--- a/python/reg_tests/tests_cs/test6.py
+++ b/reg_tests/tests_cs/test6.py
@@ -5,25 +5,17 @@
 ############################################################
 import sys, os, copy
 from mpi4py import MPI
-
 from baseclasses import AeroProblem
 from pygeo import DVGeometry
 import pyspline
-
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-
 if 'complex' in sys.argv:
-    from python.pyADflow_C import ADFLOW_C as ADFLOW
+    from adflow import ADFLOW_C as ADFLOW
     from pywarp import MBMesh_C as MBMesh
 else:
-    from python.pyADflow import ADFLOW
-    from pywarp import  MBMesh
+    from adflow import ADFLOW
+    from pywarp import MBMesh
 # ###################################################################
 # ****************************************************************************
 printHeader('MDO tutorial RANS Geometric Variables')
diff --git a/python/reg_tests/tests_cs/test7.py b/reg_tests/tests_cs/test7.py
similarity index 93%
rename from python/reg_tests/tests_cs/test7.py
rename to reg_tests/tests_cs/test7.py
index 22c5f5192..9f5920165 100644
--- a/python/reg_tests/tests_cs/test7.py
+++ b/reg_tests/tests_cs/test7.py
@@ -12,17 +12,11 @@
 
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-
 if 'complex' in sys.argv:
-    from python.pyADflow_C import ADFLOW_C as ADFLOW
+    from adflow import ADFLOW_C as ADFLOW
     from idwarp import USMesh_C as USMesh
 else:
-    from python.pyADflow import ADFLOW
+    from adflow import ADFLOW
     from idwarp import  USMesh
 # ###################################################################
 
diff --git a/python/reg_tests/tests_cs/test8.py b/reg_tests/tests_cs/test8.py
similarity index 93%
rename from python/reg_tests/tests_cs/test8.py
rename to reg_tests/tests_cs/test8.py
index 4b4501443..c40e5841f 100644
--- a/python/reg_tests/tests_cs/test8.py
+++ b/reg_tests/tests_cs/test8.py
@@ -12,17 +12,11 @@
 
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-
 if 'complex' in sys.argv:
-    from python.pyADflow_C import ADFLOW_C as ADFLOW
+    from adflow import ADFLOW_C as ADFLOW
     from idwarp import USMesh_C as USMesh
 else:
-    from python.pyADflow import ADFLOW
+    from adflow import ADFLOW
     from idwarp import  USMesh
 # ###################################################################
 
diff --git a/python/reg_tests/tests_cs/test9.py b/reg_tests/tests_cs/test9.py
similarity index 94%
rename from python/reg_tests/tests_cs/test9.py
rename to reg_tests/tests_cs/test9.py
index 9a41ae133..575b45102 100644
--- a/python/reg_tests/tests_cs/test9.py
+++ b/reg_tests/tests_cs/test9.py
@@ -12,18 +12,12 @@
 
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-
 if 'complex' in sys.argv:
-    from python.pyADflow_C import ADFLOW_C as ADFLOW
+    from adflow import ADFLOW_C as ADFLOW
     from idwarp import USMesh_C as USMesh
 else:
-    from python.pyADflow import ADFLOW
-    from idwarp import  USMesh
+    from adflow import ADFLOW
+    from idwarp import USMesh
 # ###################################################################
 # ****************************************************************************
 printHeader('MDO tutorial RANS Geometric Variables with IDWarp')
diff --git a/setup.py b/setup.py
new file mode 100644
index 000000000..ba878c764
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,52 @@
+from setuptools import setup
+import re
+
+__version__ = re.findall(
+    r"""__version__ = ["']+([0-9\.]*)["']+""",
+    open('adflow/__init__.py').read(),
+)[0]
+
+setup(name='adflow',
+      version=__version__,
+
+
+      description="ADflow is a multi-block structured flow solver developed by the MDO Lab at the University of Michigan",
+      long_description="""ADflow is a multi-block structured flow solver developed by the MDO Lab at the University of Michigan.
+      It solves the compressible Euler, laminar Navier-Stokes and Reynolds-Averaged Navier-Stokes equations.
+      ADflow's features include the following:
+
+      - Discrete adjoint implementation
+      - "Complexified" code for complex-step derivative verification
+      - Massively parallel (both CPU and memory scalable) implementation using MPI.
+
+      ## Documentation
+      Please see the [documentation](https://mdolab-adflow.readthedocs-hosted.com/en/latest/) for installation details and API documentation.
+
+      To locally build the documentation, enter the `doc` folder and enter `make html` in terminal.
+      You can then view the built documentation in the `_build` folder.
+
+      """,
+      long_description_content_type="text/markdown",
+      keywords='RANS adjoint fast optimization',
+      author='',
+      author_email='',
+      url='https://github.com/mdolab/adflow',
+      license='LGPL version 2.1',
+      packages=[
+          'adflow',
+      ],
+      package_data={
+          'adflow': ['*.so']
+      },
+      install_requires=[
+            'numpy>=1.16.4',
+            'baseclasses>=1.2.0',
+            'mpi4py>=3.0.2',
+            'petsc4py>=3.11.0',
+
+      ],
+      classifiers=[
+        "Operating System :: Linux",
+        "Programming Language :: Python, Fortran"]
+      )
+
diff --git a/src/build/Makefile b/src/build/Makefile
index ec3933863..0fe75f593 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -121,4 +121,4 @@ python: lib ../f2py/adflow.pyf
 	$(FF90) -shared $(PYTHON_OBJECTS) libadflow.a $(LINKER_ALL_FLAGS) -o libadflow.so
 	cp -fr ../f2py/importTest.py .
 	$(PYTHON) importTest.py
-	mv libadflow.so ../../python
+	mv libadflow.so ../../adflow
diff --git a/src_cs/build/Makefile b/src_cs/build/Makefile
index d91a30060..b9c9c0c64 100644
--- a/src_cs/build/Makefile
+++ b/src_cs/build/Makefile
@@ -140,4 +140,4 @@ python: lib ../f2py/adflow.pyf
 	$(FF90) -shared $(PYTHON_OBJECTS) libadflow.a $(LINKER_ALL_FLAGS) -o libadflow_cs.so
 	cp -fr ../f2py/importTest.py .
 	$(PYTHON) ../f2py/importTest.py
-	mv libadflow_cs.so ../../python
+	mv libadflow_cs.so ../../adflow