diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0a6fa7e5105205d48cdcb297735d2c26b7a2bbe..c45541e8f90ff2f25e1018ae6dede8030187b708 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
 
 set(STAGE_DIR "${CMAKE_BINARY_DIR}/stage")
 set(HEADER_STAGE_PATH ${STAGE_DIR}/include)
-set(SHARED_DATA_PATH ${STAGE_DIR}/share/)
+set(SHARED_DATA_PATH ${STAGE_DIR}/share/qmean/)
 include_directories("${HEADER_STAGE_PATH}")
 link_directories(${LIB_STAGE_PATH})
 
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e920e8fac6a032ca56aea3db6956049be8c2a974..f78bde4c5bbb803616e1a62ed3a63a4356995617 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -60,7 +60,7 @@ copy_if_different("./" "${SHARED_DATA_PATH}/scorer/local_nn_scorer"
 
 
 install(FILES ${POTENTIAL_FILES} DESTINATION "share/qmean/potentials")
-install(FILES ${REFERENCE_TABLE_FILES} DESTINATION "share/qmean/references")
+install(FILES ${REFERENCE_TABLE_FILES} DESTINATION "share/qmean/reference_values")
 install(FILES ${LINEAR_SCORER_FILES} DESTINATION "share/qmean/scorer")
-install(FILES ${LOCAL_NN_SCORER_FILES} DESTINATION "share/qmean/scorer/linear_nn_scorer")
+install(FILES ${LOCAL_NN_SCORER_FILES} DESTINATION "share/qmean/scorer/local_nn_scorer")
 
diff --git a/pymod/conf.py b/pymod/conf.py
index 5930126bf5bcf76aa249813ea59aedce6ca71cc0..dcb8ab9638b9370dc05b320c34c1cb63916a83fe 100644
--- a/pymod/conf.py
+++ b/pymod/conf.py
@@ -22,7 +22,7 @@ import sys
 # can be adapted when calling make install. This soultion assumes conf.py
 # to be in stage/lib64/python2.7/site-packages/qmean
 QMEAN_DATA_DIR = os.path.abspath(os.path.join(os.path.dirname( __file__ ), 
-                                              '..', '..', '..', '..', 'share'))
+                                              '..', '..', '..', '..', 'share', 'qmean'))
 if not os.path.exists(QMEAN_DATA_DIR):
   print 'internal configuration error:'
   print '  The QMean data directory "%s" does not exist.' % QMEAN_DATA_DIR