thodg/libgit2

diff --git a/.gitignore b/.gitignore
index bba9d5d..d4e0454 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/tests-clar/clar.suite
-/tests-clar/clar.suite.rule
-/tests-clar/.clarcache
+/tests/clar.suite
+/tests/clar.suite.rule
+/tests/.clarcache
 /apidocs
 /trash-*.exe
 /libgit2.pc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 271af69..ac1032a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ ENDFUNCTION()
 # explorer does. This is esp. useful with the libgit2_clar project, were
 # usually 2 or more files share the same name.  Sadly, this file grouping
 # is a per-directory option in cmake and not per-target, resulting in
-# empty virtual folders "tests-clar" for the git2.dll
+# empty virtual folders "tests" for the git2.dll
 FUNCTION(MSVC_SPLIT_SOURCES target)
 	IF(MSVC_IDE)
 		GET_TARGET_PROPERTY(sources ${target} SOURCES)
@@ -393,9 +393,9 @@ INSTALL(FILES include/git2.h DESTINATION ${INCLUDE_INSTALL_DIR} )
 IF (BUILD_CLAR)
 	FIND_PACKAGE(PythonInterp REQUIRED)
 
-	SET(CLAR_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/tests-clar/resources/")
-	SET(CLAR_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tests-clar")
-	SET(CLAR_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tests-clar/resources" CACHE PATH "Path to test resources.")
+	SET(CLAR_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/tests/resources/")
+	SET(CLAR_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tests")
+	SET(CLAR_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tests/resources" CACHE PATH "Path to test resources.")
 	ADD_DEFINITIONS(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\")
 	ADD_DEFINITIONS(-DCLAR_RESOURCES=\"${TEST_RESOURCES}\")
 
diff --git a/examples/general.c b/examples/general.c
index f23dccb..58e141b 100644
--- a/examples/general.c
+++ b/examples/general.c
@@ -66,7 +66,7 @@ int main (int argc, char** argv)
   // simplest.  There are also [methods][me] for specifying the index file
   // and work tree locations, here we assume they are in the normal places.
 	//
-	// (Try running this program against tests-clar/resources/testrepo.git.)
+	// (Try running this program against tests/resources/testrepo.git.)
   //
   // [me]: http://libgit2.github.com/libgit2/#HEAD/group/repository
   int error;
diff --git a/examples/test/test-rev-list.sh b/examples/test/test-rev-list.sh
index bc0eea7..aa645be 100755
--- a/examples/test/test-rev-list.sh
+++ b/examples/test/test-rev-list.sh
@@ -4,7 +4,7 @@ THIS_FILE="$(readlink -f "$0")"
 ROOT="$(dirname "$(dirname "$(dirname "$THIS_FILE")")")"
 PROGRAM="$ROOT"/examples/rev-list
 LIBDIR="$ROOT"/build
-REPO="$ROOT"/tests-clar/resources/testrepo.git
+REPO="$ROOT"/tests/resources/testrepo.git
 
 cd "$REPO"
 
diff --git a/include/git2/pack.h b/include/git2/pack.h
index 52e7ada..88a2716 100644
--- a/include/git2/pack.h
+++ b/include/git2/pack.h
@@ -38,7 +38,7 @@
  *   `git_packbuilder_set_threads` can be used to adjust the number of
  *   threads used for the process.
  *
- * See tests-clar/pack/packbuilder.c for an example.
+ * See tests/pack/packbuilder.c for an example.
  *
  * @ingroup Git
  * @{
diff --git a/tests/odb/foreach.c b/tests/odb/foreach.c
index f643d96..ebb8866 100644
--- a/tests/odb/foreach.c
+++ b/tests/odb/foreach.c
@@ -27,7 +27,7 @@ static int foreach_cb(const git_oid *oid, void *data)
 }
 
 /*
- * $ git --git-dir tests-clar/resources/testrepo.git count-objects --verbose
+ * $ git --git-dir tests/resources/testrepo.git count-objects --verbose
  * count: 47
  * size: 4
  * in-pack: 1640
diff --git a/tests/pack/packbuilder.c b/tests/pack/packbuilder.c
index 54d1e80..1ae2322 100644
--- a/tests/pack/packbuilder.c
+++ b/tests/pack/packbuilder.c
@@ -106,7 +106,7 @@ void test_pack_packbuilder__create_pack(void)
 	 * we create exactly the same pack as git.git does when *not*
 	 * reusing existing deltas (as libgit2).
 	 *
-	 * $ cd tests-clar/resources/testrepo.git
+	 * $ cd tests/resources/testrepo.git
 	 * $ git rev-list --objects HEAD | \
 	 * 	git pack-objects -q --no-reuse-delta --threads=1 pack
 	 * $ sha1sum git-80e61eb315239ef3c53033e37fee43b744d57122.pack