diff --git a/eo/src/pyeo/CMakeLists.txt b/eo/src/pyeo/CMakeLists.txt
index 626d02012..ab0e0c1e6 100644
--- a/eo/src/pyeo/CMakeLists.txt
+++ b/eo/src/pyeo/CMakeLists.txt
@@ -27,23 +27,23 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 
-# python
 IF(APPLE)
   # osx internal
   FIND_LIBRARY(APPLE_CARBON Carbon)
 ENDIF(APPLE)
 
-
 # includes
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(../)
+#INCLUDE_DIRECTORIES(../)
 
 # source
 FILE(GLOB SOURCES *.cpp)
 
+# EO dependencies
 SET(EO_SOURCES
-  ../eoFunctorStore.cpp
-  ../utils/eoLogger.cpp
+  ${EO_SOURCE_DIR}/src/eoFunctorStore.cpp
+  ${EO_SOURCE_DIR}/src/utils/eoLogger.cpp
+  ${EO_SOURCE_DIR}/src/utils/eoParallel.cpp
   )
 
 # shared library
diff --git a/eo/src/pyeo/test/maxone.py b/eo/src/pyeo/test/maxone.py
index 3544d4988..0c4bbd012 100644
--- a/eo/src/pyeo/test/maxone.py
+++ b/eo/src/pyeo/test/maxone.py
@@ -2,7 +2,7 @@ import sys
 sys.path.append('..')
 
 print 'importing pyeo'
-from PyEO import *
+from libPyEO import *
 print 'done'
 
 from copy import copy
diff --git a/eo/src/pyeo/test/run_tests.sh b/eo/src/pyeo/test/run_tests.sh
index f3901050c..b06c61b05 100755
--- a/eo/src/pyeo/test/run_tests.sh
+++ b/eo/src/pyeo/test/run_tests.sh
@@ -5,5 +5,3 @@ do
     python $i > /dev/null
 
 done
-
-
diff --git a/eo/src/pyeo/test/test_transform.py b/eo/src/pyeo/test/test_transform.py
index fb70de3ee..7359342e5 100644
--- a/eo/src/pyeo/test/test_transform.py
+++ b/eo/src/pyeo/test/test_transform.py
@@ -1,7 +1,7 @@
 """Test script for the eoSGATranform class"""
 
 from copy import deepcopy
-from PyEO import *
+from libPyEO import *
 from maxone import *
 
 pop = eoPop()