diff --git a/Dockerfile b/Dockerfile
index 0cf555b9a..3a4d5ce6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -136,7 +136,7 @@ COPY --from=build_driver /usr/local/lib/libswiftest.a /
 
 # This build target exports the module file to the host
 FROM scratch as export_module
-COPY --from=build_driver /usr/local/include/swiftest.mod /
+COPY --from=build_driver /swiftest/include/ /swiftest/
 
 
 # This build target creates a container with a conda environment with all dependencies needed to run the Python front end and 
@@ -149,7 +149,7 @@ ENV LD_LIBRARY_PATH="/usr/local/lib"
 
 COPY --from=build_driver /usr/local/bin/swiftest_driver /opt/conda/bin/swiftest_driver
 COPY --from=build_driver /usr/local/lib/libswiftest.a  /opt/conda/lib/libswiftest.a
-COPY --from=build_driver /usr/local/include/swiftest.mod  /opt/conda/include/swiftest.mod
+COPY --from=build_driver /swiftest/include/ /opt/conda/include/swiftest/
 COPY ./python/. /opt/conda/pkgs/
 COPY environment.yml .
 
diff --git a/python/swiftest/f2py/pydriver.f90 b/python/swiftest/f2py/pydriver.f90
new file mode 100644
index 000000000..360d103ff
--- /dev/null
+++ b/python/swiftest/f2py/pydriver.f90
@@ -0,0 +1,24 @@
+subroutine driver(integrator, param_file_name, display_style)
+
+   !! author: David A. Minton
+   !!
+   !! Driver program for the Swiftest integrators. Unlike the earlier Swift and Swifter drivers, in Swiftest all integrators 
+   !!    are run from this single program. 
+   !!
+   !! Adapted from Swifter by David E. Kaufmann's Swifter driver programs swifter_[bs,helio,ra15,rmvs,symba,tu4,whm].f90
+   !! Adapted from Hal Levison and Martin Duncan's Swift driver programs
+   use swiftest
+   implicit none
+
+   ! Arguments
+   character(len=:), intent(in), allocatable :: integrator      !! Symbolic code of the requested integrator  
+   character(len=:), intent(in), allocatable :: param_file_name !! Name of the input parameters file
+   character(len=:), intent(in), allocatable :: display_style   !! Style of the output display {"STANDARD", "COMPACT", "PROGRESS"}). Default is "STANDARD")
+   !f2py intent(in) integrator
+   !f2py intent(in) param_file_name
+   !f2py intent(in) display_style
+
+   call swiftest_driver(integrator, param_file_name, display_style)
+
+   return
+end subroutine driver
\ No newline at end of file