diff --git a/pykat/components.py b/pykat/components.py
index 42d63af071e8b5f903150b3b3581f442089c0b63..dbd95a23875dc33af6e3dc2931864868df92df51 100644
--- a/pykat/components.py
+++ b/pykat/components.py
@@ -35,6 +35,7 @@ from pykat.SIfloat import *
 from pykat.param import Param, AttrParam
 import weakref
 import pykat.exceptions as pkex
+from copy import deepcopy
 
 next_component_id = 1
 
@@ -108,8 +109,7 @@ class Component(object):
         # store a unique ID for this component
         global next_component_id
         self.__id = next_component_id
-        next_component_id += 1
-        
+        next_component_id += 1    
        
     def __deepcopy__(self, memo):
         """
diff --git a/pykat/finesse.py b/pykat/finesse.py
index 0a614967295049cded3ee0c352d6fa7bcbfb89bd..9b469143a7d0e826a413f8c9f7b7491d1cccac8c 100644
--- a/pykat/finesse.py
+++ b/pykat/finesse.py
@@ -428,10 +428,9 @@ class kat(object):
         # kat objects share the same class definition they also have the
         # same properties regardless of whether they have the actual
         # object added to it. So we create an instance specific class.
-        return object.__new__(type(pykat.finesse.kat.__name__, (pykat.finesse.
-                                                                kat,), {}), *args, **kwargs)
+        return object.__new__(type(pykat.finesse.kat.__name__, (pykat.finesse.kat,), {}), *args, **kwargs)
+	
     def __init__(self, kat_file=None, kat_code=None, katdir="", katname="", tempdir=None, tempname=None):
-        
         self.scene = None # scene object for GUI
         self.verbose = True
         self.__blocks = OrderedDict() # dictionary of blocks that are used
diff --git a/setup.py b/setup.py
index c599caa663bd2dddc01346fd881d850164a8491f..83bf575a5ba3ec38b62e4f585eaf7c84fae07551 100644
--- a/setup.py
+++ b/setup.py
@@ -14,12 +14,12 @@ setup(
     version=pykat.__version__,
     author='Daniel Brown',
     author_email='ddb@star.sr.bham.ac.uk',
-    packages=['pykat','pykat.gui','pykat.gui.resources','pykat.testing','pykat.testing.web','pykat.utilities','pykat.utilities.optics'],
+    packages=['pykat','pykat.gui','pykat.gui.resources','pykat.testing','pykat.testing.web','pykat.math','pykat.optics', 'pykat.external', 'pykat.tools'],
     url='http://pypi.python.org/pypi/PyKat/',
     license='GPL v2',
     description='Python interface and tools for FINESSE',
     long_description=open('README.rst').read(),
     install_requires=REQUIREMENTS,
-    package_data={'': ['utilities/greedypoints/*.txt']},
+    package_data={'': ['optics/greedypoints/*.txt']},
     include_package_data=True
-)
\ No newline at end of file
+)