diff --git a/Dockerfile b/Dockerfile
index 51e6ff0..37f37ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,7 @@ MAINTAINER Jim Rybarski <jim@rybarski.com>
 
 RUN mkdir -p /var/nds2
 RUN apt-get update && apt-get install -y \
-    python-numpy \
-    python-setuptools
+    python-numpy
 
 COPY . /opt/nd2reader
 WORKDIR /opt/nd2reader
diff --git a/nd2reader/parser.py b/nd2reader/parser.py
index 650e751..a794627 100644
--- a/nd2reader/parser.py
+++ b/nd2reader/parser.py
@@ -8,6 +8,7 @@ import re
 import struct
 from StringIO import StringIO
 
+
 field_of_view = namedtuple('FOV', ['number', 'x', 'y', 'z', 'pfs_offset'])
 
 
diff --git a/setup.py b/setup.py
index 49e06ac..6ac6438 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
 
 setup(
     name="nd2reader",
-    packages=['nd2reader'],
+    packages=['nd2reader', 'nd2reader.model'],
     version="1.0.0",
     description='A tool for reading ND2 files produced by NIS Elements',
     author='Jim Rybarski',
@@ -10,5 +10,12 @@ setup(
     url='https://github.com/jimrybarski/nd2reader',
     download_url='https://github.com/jimrybarski/nd2reader/tarball/1.0.0',
     keywords=['nd2', 'nikon', 'microscopy', 'NIS Elements'],
-    classifiers=[]
+    classifiers=['Development Status :: 5 - Production/Stable',
+                 'Intended Audience :: Science/Research',
+                 'License :: Freely Distributable',
+                 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+                 'Operating System :: POSIX :: Linux',
+                 'Programming Language :: Python :: 2.7',
+                 'Topic :: Scientific/Engineering',
+                 ]
 )