diff --git a/CHANGES.rst b/CHANGES.rst
index 2180e01..4f9d688 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,13 +7,21 @@ Version History and Change Log
 
 Version 1.0.8
 =============
-*2020 Date TBD*
+*2020 May 22*
 
-- Future changes here
+**STIPS Improvements**
+
+- PSFs generated with `webbpsf` are now PSF grids. [:pr:``, :user:`york-stsci`]
+- STIPS has the option to keep all data in memory. [:pr:``, :user:`york-stsci`]
+- Data files have been removed from the repo to allow STIPS to be uploaded to PyPi (pip). The data has been migrated to a STScI box folder. Users can now download the data and set their `stips_data` to allow access to the data that once lived in the repository. [:pr:`59`, :user:`york-stsci`]
+- Travis was setup to run and pass tests. Outdated tests have been removed to allow Travis to pass. [:pr:`65`, :user:`robelgeda`]
+- Test data has been moved to a STScI box folder. [:pr:`64`, :user:`robelgeda`]
+- `dev` folder added for any developer related tools. [:pr:`69`, :user:`robelgeda`]
+- Frozen environments saved at `dev/conda_envs`. [:pr:`69`, :user:`robelgeda`]
 
 Version 1.0.7
 =============
-*2019 January 8*
+*2020 January 8*
 
 **STIPS Improvements**
 
diff --git a/Dockerfile b/Dockerfile
index 1f51d6e..88b099e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,6 +54,10 @@ RUN pip install -U setuptools
 
 WORKDIR /opt
 
+# Extract STIPS reference data
+RUN wget -qO- https://stsci.box.com/shared/static/iufbhsiu0lts16wmdsi12cun25888nrb.gz| tar xvz
+ENV stips_data /opt/stips_data
+
 # Extract PySynphot reference data
 RUN wget -qO- http://ssb.stsci.edu/cdbs/tarfiles/synphot1.tar.gz | tar xvz
 RUN wget -qO- http://ssb.stsci.edu/cdbs/tarfiles/synphot2.tar.gz | tar xvz
@@ -117,6 +121,5 @@ WORKDIR $HOME
 
 WORKDIR $STIPSDIR
 RUN python setup.py develop
-ENV stips_data $STIPSDIR/stips/data
 
 WORKDIR $HOME
diff --git a/dev/conda_envs/environment_v1.0.7.yml b/dev/conda_envs/environment_v1.0.7.yml
new file mode 100644
index 0000000..7488097
--- /dev/null
+++ b/dev/conda_envs/environment_v1.0.7.yml
@@ -0,0 +1,211 @@
+# This file describes a conda environment that can be to install STIPS
+#
+# Run the following command to set up this environment:
+# $ conda env create -f environment.yml
+#
+# The environment name can be overridden with the following command:
+# $ conda env create -n <custom name> -f environment.yml
+#
+# Run the following command to activate the environment:
+# $ source activate stips
+#
+# To deactivate the environment run the following command:
+# $ source deactivate
+#
+# To remove the environment entirely, run the following command:
+# $ conda env remove -n stips
+
+name: stips
+channels:
+  - http://ssb.stsci.edu/astroconda
+  - conda-forge
+  - conda-canary
+  - defaults
+dependencies:
+  - alabaster=0.7.12=py_0
+  - appnope=0.1.0=py37hc8dfbb8_1001
+  - asdf=2.6.0=py_0
+  - astropy=4.0.1.post1=py37h9bfed18_0
+  - attrs=19.3.0=py_0
+  - babel=2.8.0=py_0
+  - backcall=0.1.0=py_0
+  - beautifulsoup4=4.9.0=py37hc8dfbb8_0
+  - bleach=3.1.5=pyh9f0ad1d_0
+  - brotlipy=0.7.0=py37h9bfed18_1000
+  - ca-certificates=2020.4.5.1=hecc5488_0
+  - certifi=2020.4.5.1=py37hc8dfbb8_0
+  - cffi=1.14.0=py37h356ff06_0
+  - chardet=3.0.4=py37hc8dfbb8_1006
+  - cloudpickle=1.4.1=py_0
+  - configparser=5.0.0=py_0
+  - cryptography=2.9.2=py37he655712_0
+  - cycler=0.10.0=py_2
+  - cython=0.29.17=py37h570ac47_0
+  - cytoolz=0.10.1=py37h0b31af3_0
+  - dask-core=2.16.0=py_0
+  - dbus=1.13.6=h2f22bb5_0
+  - decorator=4.4.2=py_0
+  - defusedxml=0.6.0=py_0
+  - docutils=0.16=py37hc8dfbb8_1
+  - entrypoints=0.3=py37hc8dfbb8_1001
+  - esutil=0.6.4=py37h4f17bb1_0
+  - et_xmlfile=1.0.1=py_1001
+  - expat=2.2.9=h4a8c4bd_2
+  - fftw=3.3.8=nompi_h44ae4c8_1110
+  - freetype=2.10.2=h8da9a1a_0
+  - gettext=0.19.8.1=h46ab8bc_1002
+  - glib=2.64.2=h577aef8_0
+  - gwcs=0.12.0=py_0
+  - healpy=1.13.0=py37h1cf269a_1
+  - html5lib=1.0.1=py_0
+  - icu=64.2=h6de7cb9_1
+  - idna=2.9=py_1
+  - imagecodecs-lite=2019.12.3=py37h9bfed18_0
+  - imageio=2.8.0=py_0
+  - imagesize=1.2.0=py_0
+  - importlib-metadata=1.6.0=py37hc8dfbb8_0
+  - importlib_metadata=1.6.0=0
+  - ipykernel=5.2.1=py37h43977f1_0
+  - ipython=7.14.0=py37hc8dfbb8_0
+  - ipython_genutils=0.2.0=py_1
+  - ipywidgets=7.5.1=py_0
+  - jdcal=1.4.1=py_0
+  - jedi=0.17.0=py37hc8dfbb8_0
+  - jinja2=2.11.2=pyh9f0ad1d_0
+  - joblib=0.14.1=py_0
+  - jpeg=9c=h1de35cc_1001
+  - jsonschema=3.2.0=py37hc8dfbb8_1
+  - jupyter_client=6.1.3=py_0
+  - jupyter_core=4.6.3=py37hc8dfbb8_1
+  - jwxml=0.3.0=py37_1
+  - kiwisolver=1.2.0=py37ha1cc60f_0
+  - krb5=1.17.1=h1752a42_0
+  - libblas=3.8.0=16_openblas
+  - libcblas=3.8.0=16_openblas
+  - libclang=9.0.1=default_hf57f61e_0
+  - libcxx=10.0.0=h1af66ff_2
+  - libedit=3.1.20170329=hcfe32e1_1001
+  - libffi=3.2.1=h4a8c4bd_1007
+  - libgfortran=4.0.0=2
+  - libiconv=1.15=h0b31af3_1006
+  - liblapack=3.8.0=16_openblas
+  - libllvm9=9.0.1=h7475705_1
+  - libopenblas=0.3.9=h3d69b6c_0
+  - libpng=1.6.37=hbbe82c9_1
+  - libpq=12.2=h489d428_1
+  - libsodium=1.0.17=h01d97ff_0
+  - libtiff=4.1.0=h2ae36a8_6
+  - libwebp-base=1.1.0=h0b31af3_3
+  - libxml2=2.9.10=h53d96d6_0
+  - libxslt=1.1.33=h320ff13_0
+  - llvm-openmp=10.0.0=h28b9765_0
+  - lxml=4.5.0=py37heb1707f_1
+  - lz4-c=1.9.2=h4a8c4bd_1
+  - markupsafe=1.1.1=py37h9bfed18_1
+  - matplotlib=3.2.1=0
+  - matplotlib-base=3.2.1=py37hddda452_0
+  - mechanize=0.4.5=py_0
+  - mistune=0.8.4=py37h9bfed18_1001
+  - more-itertools=8.2.0=py_0
+  - nbconvert=5.6.1=py37hc8dfbb8_1
+  - nbformat=5.0.6=py_0
+  - ncurses=6.1=h0a44026_1002
+  - networkx=2.4=py_1
+  - notebook=6.0.3=py37hc8dfbb8_0
+  - nspr=4.20=h0a44026_1000
+  - nss=3.47=hc0980d9_0
+  - numpy=1.18.4=py37h7687784_0
+  - numpydoc=0.9.2=py_0
+  - olefile=0.46=py_0
+  - openpyxl=3.0.3=py_0
+  - openssl=1.1.1g=h0b31af3_0
+  - packaging=20.1=py_0
+  - pandoc=2.9.2.1=0
+  - pandocfilters=1.4.2=py_1
+  - parso=0.7.0=pyh9f0ad1d_0
+  - pcre=8.44=h4a8c4bd_0
+  - pexpect=4.8.0=py37hc8dfbb8_1
+  - photutils=0.7.2=py37h0b31af3_1
+  - pickleshare=0.7.5=py37hc8dfbb8_1001
+  - pillow=7.1.2=py37hfd78ece_0
+  - pip=20.1=pyh9f0ad1d_0
+  - pluggy=0.13.1=py37hc8dfbb8_1
+  - poppy=0.9.0=py37_0
+  - prometheus_client=0.7.1=py_0
+  - prompt-toolkit=3.0.5=py_0
+  - ptyprocess=0.6.0=py_1001
+  - py=1.8.1=py_0
+  - pycparser=2.20=py_0
+  - pyfftw=0.12.0=py37hfc61702_1
+  - pygments=2.6.1=py_0
+  - pyopenssl=19.1.0=py_1
+  - pyparsing=2.4.7=pyh9f0ad1d_0
+  - pyqt=5.12.3=py37ha62fc16_3
+  - pyrsistent=0.16.0=py37h9bfed18_0
+  - pysiaf=0.7.1=py37_0
+  - pysocks=1.7.1=py37hc8dfbb8_1
+  - pysynphot=0.9.14=py37_0
+  - pytest=5.4.2=py37hc8dfbb8_0
+  - pytest-runner=5.2=py_0
+  - python=3.7.6=h90870a6_5_cpython
+  - python-dateutil=2.8.1=py_0
+  - python_abi=3.7=1_cp37m
+  - pytz=2020.1=pyh9f0ad1d_0
+  - pywavelets=1.1.1=py37h10e2902_1
+  - pyyaml=5.3.1=py37h9bfed18_0
+  - pyzmq=19.0.1=py37haec44b1_0
+  - qt=5.12.5=h514805e_3
+  - readline=8.0=hcfe32e1_0
+  - requests=2.23.0=pyh8c360ce_2
+  - scikit-image=0.17.2=py37h94625e5_0
+  - scikit-learn=0.23.0=py37hf5857e7_0
+  - scipy=1.4.1=py37hce1b9e5_3
+  - semantic_version=2.8.5=pyh9f0ad1d_0
+  - send2trash=1.5.0=py_0
+  - setuptools=46.3.0=py37hc8dfbb8_0
+  - six=1.14.0=py_1
+  - snowballstemmer=2.0.0=py_0
+  - soupsieve=1.9.4=py37hc8dfbb8_1
+  - sphinx=3.0.3=py_0
+  - sphinxcontrib-applehelp=1.0.2=py_0
+  - sphinxcontrib-devhelp=1.0.2=py_0
+  - sphinxcontrib-htmlhelp=1.0.3=py_0
+  - sphinxcontrib-jsmath=1.0.1=py_0
+  - sphinxcontrib-qthelp=1.0.3=py_0
+  - sphinxcontrib-serializinghtml=1.1.4=py_0
+  - sqlite=3.30.1=h93121df_0
+  - stsci_rtd_theme=0.0.1=py37_0
+  - terminado=0.8.3=py37hc8dfbb8_1
+  - testpath=0.4.4=py_0
+  - threadpoolctl=2.0.0=pyh5ca1d4c_0
+  - tifffile=2020.5.11=py_0
+  - tk=8.6.10=hbbe82c9_0
+  - toolz=0.10.0=py_0
+  - tornado=6.0.4=py37h9bfed18_1
+  - traitlets=4.3.3=py37hc8dfbb8_1
+  - urllib3=1.25.9=py_0
+  - wcwidth=0.1.9=pyh9f0ad1d_0
+  - webencodings=0.5.1=py_1
+  - wheel=0.34.2=py_1
+  - widgetsnbextension=3.5.1=py37_0
+  - xz=5.2.5=h0b31af3_0
+  - yaml=0.2.4=h0b31af3_0
+  - zeromq=4.3.2=h6de7cb9_2
+  - zipp=3.1.0=py_0
+  - zlib=1.2.11=h0b31af3_1006
+  - zstd=1.4.4=h4b3e974_3
+  - pip:
+    - astropy-helpers==4.0.1
+    - astropy-sphinx-theme==1.1
+    - automodinit==0.16
+    - jwst-backgrounds==1.1.2
+    - montage-wrapper==0.9.9
+    - pandeia-engine==1.5.1
+    - pyqt5-sip==4.19.18
+    - pyqtchart==5.12
+    - pyqtwebengine==5.12.1
+    - sphinx-astropy==1.3
+    - sphinx-automodapi==0.12
+    - sphinx-gallery==0.6.2
+    - webbpsf==0.9.0
+    
\ No newline at end of file
diff --git a/dev/conda_envs/environment_v1.0.8.yml b/dev/conda_envs/environment_v1.0.8.yml
new file mode 100644
index 0000000..7488097
--- /dev/null
+++ b/dev/conda_envs/environment_v1.0.8.yml
@@ -0,0 +1,211 @@
+# This file describes a conda environment that can be to install STIPS
+#
+# Run the following command to set up this environment:
+# $ conda env create -f environment.yml
+#
+# The environment name can be overridden with the following command:
+# $ conda env create -n <custom name> -f environment.yml
+#
+# Run the following command to activate the environment:
+# $ source activate stips
+#
+# To deactivate the environment run the following command:
+# $ source deactivate
+#
+# To remove the environment entirely, run the following command:
+# $ conda env remove -n stips
+
+name: stips
+channels:
+  - http://ssb.stsci.edu/astroconda
+  - conda-forge
+  - conda-canary
+  - defaults
+dependencies:
+  - alabaster=0.7.12=py_0
+  - appnope=0.1.0=py37hc8dfbb8_1001
+  - asdf=2.6.0=py_0
+  - astropy=4.0.1.post1=py37h9bfed18_0
+  - attrs=19.3.0=py_0
+  - babel=2.8.0=py_0
+  - backcall=0.1.0=py_0
+  - beautifulsoup4=4.9.0=py37hc8dfbb8_0
+  - bleach=3.1.5=pyh9f0ad1d_0
+  - brotlipy=0.7.0=py37h9bfed18_1000
+  - ca-certificates=2020.4.5.1=hecc5488_0
+  - certifi=2020.4.5.1=py37hc8dfbb8_0
+  - cffi=1.14.0=py37h356ff06_0
+  - chardet=3.0.4=py37hc8dfbb8_1006
+  - cloudpickle=1.4.1=py_0
+  - configparser=5.0.0=py_0
+  - cryptography=2.9.2=py37he655712_0
+  - cycler=0.10.0=py_2
+  - cython=0.29.17=py37h570ac47_0
+  - cytoolz=0.10.1=py37h0b31af3_0
+  - dask-core=2.16.0=py_0
+  - dbus=1.13.6=h2f22bb5_0
+  - decorator=4.4.2=py_0
+  - defusedxml=0.6.0=py_0
+  - docutils=0.16=py37hc8dfbb8_1
+  - entrypoints=0.3=py37hc8dfbb8_1001
+  - esutil=0.6.4=py37h4f17bb1_0
+  - et_xmlfile=1.0.1=py_1001
+  - expat=2.2.9=h4a8c4bd_2
+  - fftw=3.3.8=nompi_h44ae4c8_1110
+  - freetype=2.10.2=h8da9a1a_0
+  - gettext=0.19.8.1=h46ab8bc_1002
+  - glib=2.64.2=h577aef8_0
+  - gwcs=0.12.0=py_0
+  - healpy=1.13.0=py37h1cf269a_1
+  - html5lib=1.0.1=py_0
+  - icu=64.2=h6de7cb9_1
+  - idna=2.9=py_1
+  - imagecodecs-lite=2019.12.3=py37h9bfed18_0
+  - imageio=2.8.0=py_0
+  - imagesize=1.2.0=py_0
+  - importlib-metadata=1.6.0=py37hc8dfbb8_0
+  - importlib_metadata=1.6.0=0
+  - ipykernel=5.2.1=py37h43977f1_0
+  - ipython=7.14.0=py37hc8dfbb8_0
+  - ipython_genutils=0.2.0=py_1
+  - ipywidgets=7.5.1=py_0
+  - jdcal=1.4.1=py_0
+  - jedi=0.17.0=py37hc8dfbb8_0
+  - jinja2=2.11.2=pyh9f0ad1d_0
+  - joblib=0.14.1=py_0
+  - jpeg=9c=h1de35cc_1001
+  - jsonschema=3.2.0=py37hc8dfbb8_1
+  - jupyter_client=6.1.3=py_0
+  - jupyter_core=4.6.3=py37hc8dfbb8_1
+  - jwxml=0.3.0=py37_1
+  - kiwisolver=1.2.0=py37ha1cc60f_0
+  - krb5=1.17.1=h1752a42_0
+  - libblas=3.8.0=16_openblas
+  - libcblas=3.8.0=16_openblas
+  - libclang=9.0.1=default_hf57f61e_0
+  - libcxx=10.0.0=h1af66ff_2
+  - libedit=3.1.20170329=hcfe32e1_1001
+  - libffi=3.2.1=h4a8c4bd_1007
+  - libgfortran=4.0.0=2
+  - libiconv=1.15=h0b31af3_1006
+  - liblapack=3.8.0=16_openblas
+  - libllvm9=9.0.1=h7475705_1
+  - libopenblas=0.3.9=h3d69b6c_0
+  - libpng=1.6.37=hbbe82c9_1
+  - libpq=12.2=h489d428_1
+  - libsodium=1.0.17=h01d97ff_0
+  - libtiff=4.1.0=h2ae36a8_6
+  - libwebp-base=1.1.0=h0b31af3_3
+  - libxml2=2.9.10=h53d96d6_0
+  - libxslt=1.1.33=h320ff13_0
+  - llvm-openmp=10.0.0=h28b9765_0
+  - lxml=4.5.0=py37heb1707f_1
+  - lz4-c=1.9.2=h4a8c4bd_1
+  - markupsafe=1.1.1=py37h9bfed18_1
+  - matplotlib=3.2.1=0
+  - matplotlib-base=3.2.1=py37hddda452_0
+  - mechanize=0.4.5=py_0
+  - mistune=0.8.4=py37h9bfed18_1001
+  - more-itertools=8.2.0=py_0
+  - nbconvert=5.6.1=py37hc8dfbb8_1
+  - nbformat=5.0.6=py_0
+  - ncurses=6.1=h0a44026_1002
+  - networkx=2.4=py_1
+  - notebook=6.0.3=py37hc8dfbb8_0
+  - nspr=4.20=h0a44026_1000
+  - nss=3.47=hc0980d9_0
+  - numpy=1.18.4=py37h7687784_0
+  - numpydoc=0.9.2=py_0
+  - olefile=0.46=py_0
+  - openpyxl=3.0.3=py_0
+  - openssl=1.1.1g=h0b31af3_0
+  - packaging=20.1=py_0
+  - pandoc=2.9.2.1=0
+  - pandocfilters=1.4.2=py_1
+  - parso=0.7.0=pyh9f0ad1d_0
+  - pcre=8.44=h4a8c4bd_0
+  - pexpect=4.8.0=py37hc8dfbb8_1
+  - photutils=0.7.2=py37h0b31af3_1
+  - pickleshare=0.7.5=py37hc8dfbb8_1001
+  - pillow=7.1.2=py37hfd78ece_0
+  - pip=20.1=pyh9f0ad1d_0
+  - pluggy=0.13.1=py37hc8dfbb8_1
+  - poppy=0.9.0=py37_0
+  - prometheus_client=0.7.1=py_0
+  - prompt-toolkit=3.0.5=py_0
+  - ptyprocess=0.6.0=py_1001
+  - py=1.8.1=py_0
+  - pycparser=2.20=py_0
+  - pyfftw=0.12.0=py37hfc61702_1
+  - pygments=2.6.1=py_0
+  - pyopenssl=19.1.0=py_1
+  - pyparsing=2.4.7=pyh9f0ad1d_0
+  - pyqt=5.12.3=py37ha62fc16_3
+  - pyrsistent=0.16.0=py37h9bfed18_0
+  - pysiaf=0.7.1=py37_0
+  - pysocks=1.7.1=py37hc8dfbb8_1
+  - pysynphot=0.9.14=py37_0
+  - pytest=5.4.2=py37hc8dfbb8_0
+  - pytest-runner=5.2=py_0
+  - python=3.7.6=h90870a6_5_cpython
+  - python-dateutil=2.8.1=py_0
+  - python_abi=3.7=1_cp37m
+  - pytz=2020.1=pyh9f0ad1d_0
+  - pywavelets=1.1.1=py37h10e2902_1
+  - pyyaml=5.3.1=py37h9bfed18_0
+  - pyzmq=19.0.1=py37haec44b1_0
+  - qt=5.12.5=h514805e_3
+  - readline=8.0=hcfe32e1_0
+  - requests=2.23.0=pyh8c360ce_2
+  - scikit-image=0.17.2=py37h94625e5_0
+  - scikit-learn=0.23.0=py37hf5857e7_0
+  - scipy=1.4.1=py37hce1b9e5_3
+  - semantic_version=2.8.5=pyh9f0ad1d_0
+  - send2trash=1.5.0=py_0
+  - setuptools=46.3.0=py37hc8dfbb8_0
+  - six=1.14.0=py_1
+  - snowballstemmer=2.0.0=py_0
+  - soupsieve=1.9.4=py37hc8dfbb8_1
+  - sphinx=3.0.3=py_0
+  - sphinxcontrib-applehelp=1.0.2=py_0
+  - sphinxcontrib-devhelp=1.0.2=py_0
+  - sphinxcontrib-htmlhelp=1.0.3=py_0
+  - sphinxcontrib-jsmath=1.0.1=py_0
+  - sphinxcontrib-qthelp=1.0.3=py_0
+  - sphinxcontrib-serializinghtml=1.1.4=py_0
+  - sqlite=3.30.1=h93121df_0
+  - stsci_rtd_theme=0.0.1=py37_0
+  - terminado=0.8.3=py37hc8dfbb8_1
+  - testpath=0.4.4=py_0
+  - threadpoolctl=2.0.0=pyh5ca1d4c_0
+  - tifffile=2020.5.11=py_0
+  - tk=8.6.10=hbbe82c9_0
+  - toolz=0.10.0=py_0
+  - tornado=6.0.4=py37h9bfed18_1
+  - traitlets=4.3.3=py37hc8dfbb8_1
+  - urllib3=1.25.9=py_0
+  - wcwidth=0.1.9=pyh9f0ad1d_0
+  - webencodings=0.5.1=py_1
+  - wheel=0.34.2=py_1
+  - widgetsnbextension=3.5.1=py37_0
+  - xz=5.2.5=h0b31af3_0
+  - yaml=0.2.4=h0b31af3_0
+  - zeromq=4.3.2=h6de7cb9_2
+  - zipp=3.1.0=py_0
+  - zlib=1.2.11=h0b31af3_1006
+  - zstd=1.4.4=h4b3e974_3
+  - pip:
+    - astropy-helpers==4.0.1
+    - astropy-sphinx-theme==1.1
+    - automodinit==0.16
+    - jwst-backgrounds==1.1.2
+    - montage-wrapper==0.9.9
+    - pandeia-engine==1.5.1
+    - pyqt5-sip==4.19.18
+    - pyqtchart==5.12
+    - pyqtwebengine==5.12.1
+    - sphinx-astropy==1.3
+    - sphinx-automodapi==0.12
+    - sphinx-gallery==0.6.2
+    - webbpsf==0.9.0
+    
\ No newline at end of file
diff --git a/docs/installation.rst b/docs/installation.rst
index 4411714..c81fd92 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -37,7 +37,7 @@ Downloading STIPS Data
 STIPS needs data for reference and calibration. The latest version of the STIPS data can be downloaded as follows::
 
     # Use wget ot curl to download the data
-    $ wget https://stsci.box.com/shared/static/d4repaci5st9mp0qstlynt67q6qwpig0.gz -O stips_data.tar.gz
+    $ wget https://stsci.box.com/shared/static/iufbhsiu0lts16wmdsi12cun25888nrb.gz -O stips_data.tar.gz
 
     # Unpack the data
     $ tar -xzvf stips_data.tar.gz
diff --git a/setup.cfg b/setup.cfg
index 5604a9b..bef7882 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 name = stips
 # version should be PEP440 compatible (https://www.python.org/dev/peps/pep-0440/)
-version = 1.0.7
+version = 1.0.8
 author = Space Telescope Science Institute
 author_email = york@stsci.edu
 description = STIPS is the Space Telescope Imaging Product Simulator.
diff --git a/stips/__init__.py b/stips/__init__.py
index 1bd3811..3e2f0dd 100644
--- a/stips/__init__.py
+++ b/stips/__init__.py
@@ -1,15 +1,21 @@
 from __future__ import absolute_import
 
+import os
+
 # make use of astropy affiliate framework to set __version__, __githash__, and
 # add the test() helper function
 
 from ._astropy_init import *
 
-__all__ = ['astro_image', 'errors', 'galaxy_module', 'instruments', 'observation_module', 'scene_module', 'stellar_module', 'utilities', 'version', 'test']
-# Don't modify the line above, or this line!
-import automodinit, os
-automodinit.automodinit(__name__, __file__, globals())
-del automodinit
+__all__ = ['astro_image', 'errors', 'galaxy_module', 'instruments',
+           'observation_module', 'scene_module', 'stellar_module',
+           'utilities', 'version', '__version__', 'test']
+
+try:
+    from .version import version as __version__
+except ImportError:
+    __version__ = 'dev'
+version = __version__
 
 # Local Definitions
 
@@ -17,7 +23,7 @@
 from .instruments import Instrument
 from .observation_module import ObservationModule
 from .scene_module import SceneModule
-from .version import __version__
+
 from .utilities import GetStipsData, internet, CachedJbtBackground, __grid__
 
 __grid__pandeia__version__ = __grid__.__pandeia__version__
diff --git a/stips/astro_image/__init__.py b/stips/astro_image/__init__.py
index e205473..1a28a43 100644
--- a/stips/astro_image/__init__.py
+++ b/stips/astro_image/__init__.py
@@ -1,7 +1,4 @@
 __all__ = ['astro_image']
-# Don't modify the line above, or this line!
-import automodinit
-automodinit.automodinit(__name__, __file__, globals())
-del automodinit
+
 # Local Definitions
 from .astro_image import AstroImage
diff --git a/stips/astro_image/astro_image.py b/stips/astro_image/astro_image.py
index 6844766..6d96147 100644
--- a/stips/astro_image/astro_image.py
+++ b/stips/astro_image/astro_image.py
@@ -21,7 +21,7 @@
     from cStringIO import StringIO
 
 #Local Modules
-from stips.version import __version__ as stips_version
+from .. import __version__ as stips_version
 from ..utilities import OffsetPosition
 from ..utilities import overlapadd2
 from ..utilities import overlapaddparallel
diff --git a/stips/data/CreatePhoenixGrid.py b/stips/data/CreatePhoenixGrid.py
index 2a7bfe9..cfda9df 100644
--- a/stips/data/CreatePhoenixGrid.py
+++ b/stips/data/CreatePhoenixGrid.py
@@ -19,7 +19,7 @@
 import numpy as np
 import pysynphot as ps
 from stips.utilities import InstrumentList
-from stips import __version__ as stips_version_info
+from .. import __version__ as stips_version_info
 from astropy.io import fits as pyfits
 
 print("STIPS Version: {}".format(stips_version_info))
diff --git a/stips/instruments/wfi.py b/stips/instruments/wfi.py
index a9f6811..dd9b78c 100644
--- a/stips/instruments/wfi.py
+++ b/stips/instruments/wfi.py
@@ -15,7 +15,7 @@
 from .wfirst_instrument import WfirstInstrument
 from ..utilities import OffsetPosition
 
-from stips.version import __version__ as stips_version
+from .. import __version__ as stips_version
 
 class WFI(WfirstInstrument):
     __classtype__ = "detector"
diff --git a/stips/utilities/utilities.py b/stips/utilities/utilities.py
index bd17d90..2e8f575 100644
--- a/stips/utilities/utilities.py
+++ b/stips/utilities/utilities.py
@@ -18,7 +18,7 @@
 from jwst_backgrounds.jbt import background
 from photutils.psf.models import GriddedPSFModel
 
-from stips.version import __version__ as __stips__version__
+from .. import __version__ as __stips__version__
 
 #-----------
 class classproperty(object):
diff --git a/stips/version/__init__.py b/stips/version/__init__.py
deleted file mode 100644
index bd9be3e..0000000
--- a/stips/version/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = '1.0.7.dev'