diff --git a/.gitignore b/.gitignore
index 3a21f00..dae7b5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,3 @@
-CMakeCache.txt
-CMakeFiles/
-CTestTestfile.cmake
-Makefile
-Testing
 build/
 dist/
-cmake_install.cmake
-install_manifest.txt
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b42270..22ba99b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
 	${CMAKE_SOURCE_DIR}/include
 )
 
-add_subdirectory(src/cppunit build/src/cppunit)
-add_subdirectory(test build/test)
+add_subdirectory(src/cppunit)
+add_subdirectory(test)
 
-install(DIRECTORY include/ DESTINATION ${CMAKE_SOURCE_DIR}/dist/cppunit/include)
+install(DIRECTORY include/ DESTINATION include)
diff --git a/Gemfile.lock b/Gemfile.lock
index 8eb5f36..d1aabd1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    emplace (0.1.2)
+    emplace (0.1.4)
 
 PLATFORMS
   ruby
diff --git a/Rakefile b/Rakefile
index e143963..48cdd03 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,23 +1,23 @@
 require 'rake/testtask'
 require 'emplace'
 
+project = Emplace::Project.new 'cppunit'
+
 task :clean do
   rm_rf 'build'
   rm_rf 'dist'
 end
 
 task :cmake do
-  Emplace.cmake
+  project.cmake!
 end
 
 task :build do
-  Emplace.build
+  project.build!
 end
 
 task :package do
-  chdir('dist') do
-    Emplace.package('cppunit')
-  end
+  project.package!
 end
 
 Rake::TestTask.new {|t|
diff --git a/src/cppunit/CMakeLists.txt b/src/cppunit/CMakeLists.txt
index 61205b5..0b73548 100644
--- a/src/cppunit/CMakeLists.txt
+++ b/src/cppunit/CMakeLists.txt
@@ -69,6 +69,6 @@ include_directories(
 )
 
 add_library(cppunit STATIC ${SOURCES})
-install(TARGETS cppunit ARCHIVE DESTINATION ${CMAKE_SOURCE_DIR}/dist/cppunit/lib)
+install(TARGETS cppunit ARCHIVE DESTINATION lib)