diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65513dd8..2fa8fa8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(dsd)
 cmake_minimum_required(VERSION 2.6)
 
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${dsd_SOURCE_DIR}/cmake/")
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 
 include(git_revision)
 git_describe(GIT_TAG)
@@ -39,7 +39,7 @@ install(TARGETS dsd DESTINATION bin)
 
 # uninstall target
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+    "cmake/cmake_uninstall.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
     IMMEDIATE @ONLY)
 
diff --git a/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
similarity index 100%
rename from cmake_uninstall.cmake.in
rename to cmake/cmake_uninstall.cmake.in
diff --git a/configure b/configure
deleted file mode 100755
index b27b5a82..00000000
--- a/configure
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "There is no configure script, just run make"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 03b0d220..e7f4c106 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,13 +3,11 @@ project(dsdtest)
 add_subdirectory(gtest)
 add_subdirectory(gmock)
 
-FILE(GLOB SRCS *.cpp ${dsdtest_SOURCE_DIR}/../src/Hamming.cpp)
+FILE(GLOB SRCS *.cpp ${dsd_SOURCE_DIR}/src/Hamming.cpp)
 
 include_directories(
     ${PROJECT_SOURCE_DIR}/gtest/include
     ${PROJECT_SOURCE_DIR}/gmock/include
-    ${dsdtest_SOURCE_DIR}
-    ${dsdtest_SOURCE_DIR}/..
 )
 
 add_custom_target(test