diff --git a/bin/data/090206-3.db b/bin/data/samples.db
similarity index 100%
rename from bin/data/090206-3.db
rename to bin/data/samples.db
diff --git a/bin/data/samples.zip b/bin/data/samples.zip
index 63b960fc..03d15560 100644
Binary files a/bin/data/samples.zip and b/bin/data/samples.zip differ
diff --git a/bin/data/090206-3/1.jpg b/bin/data/samples/1.jpg
similarity index 100%
rename from bin/data/090206-3/1.jpg
rename to bin/data/samples/1.jpg
diff --git a/bin/data/090206-3/10.jpg b/bin/data/samples/10.jpg
similarity index 100%
rename from bin/data/090206-3/10.jpg
rename to bin/data/samples/10.jpg
diff --git a/bin/data/090206-3/11.jpg b/bin/data/samples/11.jpg
similarity index 100%
rename from bin/data/090206-3/11.jpg
rename to bin/data/samples/11.jpg
diff --git a/bin/data/090206-3/12.jpg b/bin/data/samples/12.jpg
similarity index 100%
rename from bin/data/090206-3/12.jpg
rename to bin/data/samples/12.jpg
diff --git a/bin/data/090206-3/13.jpg b/bin/data/samples/13.jpg
similarity index 100%
rename from bin/data/090206-3/13.jpg
rename to bin/data/samples/13.jpg
diff --git a/bin/data/090206-3/14.jpg b/bin/data/samples/14.jpg
similarity index 100%
rename from bin/data/090206-3/14.jpg
rename to bin/data/samples/14.jpg
diff --git a/bin/data/090206-3/15.jpg b/bin/data/samples/15.jpg
similarity index 100%
rename from bin/data/090206-3/15.jpg
rename to bin/data/samples/15.jpg
diff --git a/bin/data/090206-3/16.jpg b/bin/data/samples/16.jpg
similarity index 100%
rename from bin/data/090206-3/16.jpg
rename to bin/data/samples/16.jpg
diff --git a/bin/data/090206-3/17.jpg b/bin/data/samples/17.jpg
similarity index 100%
rename from bin/data/090206-3/17.jpg
rename to bin/data/samples/17.jpg
diff --git a/bin/data/090206-3/18.jpg b/bin/data/samples/18.jpg
similarity index 100%
rename from bin/data/090206-3/18.jpg
rename to bin/data/samples/18.jpg
diff --git a/bin/data/090206-3/19.jpg b/bin/data/samples/19.jpg
similarity index 100%
rename from bin/data/090206-3/19.jpg
rename to bin/data/samples/19.jpg
diff --git a/bin/data/090206-3/2.jpg b/bin/data/samples/2.jpg
similarity index 100%
rename from bin/data/090206-3/2.jpg
rename to bin/data/samples/2.jpg
diff --git a/bin/data/090206-3/20.jpg b/bin/data/samples/20.jpg
similarity index 100%
rename from bin/data/090206-3/20.jpg
rename to bin/data/samples/20.jpg
diff --git a/bin/data/090206-3/21.jpg b/bin/data/samples/21.jpg
similarity index 100%
rename from bin/data/090206-3/21.jpg
rename to bin/data/samples/21.jpg
diff --git a/bin/data/090206-3/22.jpg b/bin/data/samples/22.jpg
similarity index 100%
rename from bin/data/090206-3/22.jpg
rename to bin/data/samples/22.jpg
diff --git a/bin/data/090206-3/23.jpg b/bin/data/samples/23.jpg
similarity index 100%
rename from bin/data/090206-3/23.jpg
rename to bin/data/samples/23.jpg
diff --git a/bin/data/090206-3/24.jpg b/bin/data/samples/24.jpg
similarity index 100%
rename from bin/data/090206-3/24.jpg
rename to bin/data/samples/24.jpg
diff --git a/bin/data/090206-3/25.jpg b/bin/data/samples/25.jpg
similarity index 100%
rename from bin/data/090206-3/25.jpg
rename to bin/data/samples/25.jpg
diff --git a/bin/data/090206-3/26.jpg b/bin/data/samples/26.jpg
similarity index 100%
rename from bin/data/090206-3/26.jpg
rename to bin/data/samples/26.jpg
diff --git a/bin/data/090206-3/27.jpg b/bin/data/samples/27.jpg
similarity index 100%
rename from bin/data/090206-3/27.jpg
rename to bin/data/samples/27.jpg
diff --git a/bin/data/090206-3/28.jpg b/bin/data/samples/28.jpg
similarity index 100%
rename from bin/data/090206-3/28.jpg
rename to bin/data/samples/28.jpg
diff --git a/bin/data/090206-3/29.jpg b/bin/data/samples/29.jpg
similarity index 100%
rename from bin/data/090206-3/29.jpg
rename to bin/data/samples/29.jpg
diff --git a/bin/data/090206-3/3.jpg b/bin/data/samples/3.jpg
similarity index 100%
rename from bin/data/090206-3/3.jpg
rename to bin/data/samples/3.jpg
diff --git a/bin/data/090206-3/30.jpg b/bin/data/samples/30.jpg
similarity index 100%
rename from bin/data/090206-3/30.jpg
rename to bin/data/samples/30.jpg
diff --git a/bin/data/090206-3/31.jpg b/bin/data/samples/31.jpg
similarity index 100%
rename from bin/data/090206-3/31.jpg
rename to bin/data/samples/31.jpg
diff --git a/bin/data/090206-3/32.jpg b/bin/data/samples/32.jpg
similarity index 100%
rename from bin/data/090206-3/32.jpg
rename to bin/data/samples/32.jpg
diff --git a/bin/data/090206-3/33.jpg b/bin/data/samples/33.jpg
similarity index 100%
rename from bin/data/090206-3/33.jpg
rename to bin/data/samples/33.jpg
diff --git a/bin/data/090206-3/34.jpg b/bin/data/samples/34.jpg
similarity index 100%
rename from bin/data/090206-3/34.jpg
rename to bin/data/samples/34.jpg
diff --git a/bin/data/090206-3/35.jpg b/bin/data/samples/35.jpg
similarity index 100%
rename from bin/data/090206-3/35.jpg
rename to bin/data/samples/35.jpg
diff --git a/bin/data/090206-3/36.jpg b/bin/data/samples/36.jpg
similarity index 100%
rename from bin/data/090206-3/36.jpg
rename to bin/data/samples/36.jpg
diff --git a/bin/data/090206-3/37.jpg b/bin/data/samples/37.jpg
similarity index 100%
rename from bin/data/090206-3/37.jpg
rename to bin/data/samples/37.jpg
diff --git a/bin/data/090206-3/38.jpg b/bin/data/samples/38.jpg
similarity index 100%
rename from bin/data/090206-3/38.jpg
rename to bin/data/samples/38.jpg
diff --git a/bin/data/090206-3/39.jpg b/bin/data/samples/39.jpg
similarity index 100%
rename from bin/data/090206-3/39.jpg
rename to bin/data/samples/39.jpg
diff --git a/bin/data/090206-3/4.jpg b/bin/data/samples/4.jpg
similarity index 100%
rename from bin/data/090206-3/4.jpg
rename to bin/data/samples/4.jpg
diff --git a/bin/data/090206-3/40.jpg b/bin/data/samples/40.jpg
similarity index 100%
rename from bin/data/090206-3/40.jpg
rename to bin/data/samples/40.jpg
diff --git a/bin/data/090206-3/41.jpg b/bin/data/samples/41.jpg
similarity index 100%
rename from bin/data/090206-3/41.jpg
rename to bin/data/samples/41.jpg
diff --git a/bin/data/090206-3/42.jpg b/bin/data/samples/42.jpg
similarity index 100%
rename from bin/data/090206-3/42.jpg
rename to bin/data/samples/42.jpg
diff --git a/bin/data/090206-3/43.jpg b/bin/data/samples/43.jpg
similarity index 100%
rename from bin/data/090206-3/43.jpg
rename to bin/data/samples/43.jpg
diff --git a/bin/data/090206-3/44.jpg b/bin/data/samples/44.jpg
similarity index 100%
rename from bin/data/090206-3/44.jpg
rename to bin/data/samples/44.jpg
diff --git a/bin/data/090206-3/45.jpg b/bin/data/samples/45.jpg
similarity index 100%
rename from bin/data/090206-3/45.jpg
rename to bin/data/samples/45.jpg
diff --git a/bin/data/090206-3/46.jpg b/bin/data/samples/46.jpg
similarity index 100%
rename from bin/data/090206-3/46.jpg
rename to bin/data/samples/46.jpg
diff --git a/bin/data/090206-3/47.jpg b/bin/data/samples/47.jpg
similarity index 100%
rename from bin/data/090206-3/47.jpg
rename to bin/data/samples/47.jpg
diff --git a/bin/data/090206-3/48.jpg b/bin/data/samples/48.jpg
similarity index 100%
rename from bin/data/090206-3/48.jpg
rename to bin/data/samples/48.jpg
diff --git a/bin/data/090206-3/49.jpg b/bin/data/samples/49.jpg
similarity index 100%
rename from bin/data/090206-3/49.jpg
rename to bin/data/samples/49.jpg
diff --git a/bin/data/090206-3/5.jpg b/bin/data/samples/5.jpg
similarity index 100%
rename from bin/data/090206-3/5.jpg
rename to bin/data/samples/5.jpg
diff --git a/bin/data/090206-3/50.jpg b/bin/data/samples/50.jpg
similarity index 100%
rename from bin/data/090206-3/50.jpg
rename to bin/data/samples/50.jpg
diff --git a/bin/data/090206-3/51.jpg b/bin/data/samples/51.jpg
similarity index 100%
rename from bin/data/090206-3/51.jpg
rename to bin/data/samples/51.jpg
diff --git a/bin/data/090206-3/52.jpg b/bin/data/samples/52.jpg
similarity index 100%
rename from bin/data/090206-3/52.jpg
rename to bin/data/samples/52.jpg
diff --git a/bin/data/090206-3/53.jpg b/bin/data/samples/53.jpg
similarity index 100%
rename from bin/data/090206-3/53.jpg
rename to bin/data/samples/53.jpg
diff --git a/bin/data/090206-3/54.jpg b/bin/data/samples/54.jpg
similarity index 100%
rename from bin/data/090206-3/54.jpg
rename to bin/data/samples/54.jpg
diff --git a/bin/data/090206-3/55.jpg b/bin/data/samples/55.jpg
similarity index 100%
rename from bin/data/090206-3/55.jpg
rename to bin/data/samples/55.jpg
diff --git a/bin/data/090206-3/56.jpg b/bin/data/samples/56.jpg
similarity index 100%
rename from bin/data/090206-3/56.jpg
rename to bin/data/samples/56.jpg
diff --git a/bin/data/090206-3/57.jpg b/bin/data/samples/57.jpg
similarity index 100%
rename from bin/data/090206-3/57.jpg
rename to bin/data/samples/57.jpg
diff --git a/bin/data/090206-3/58.jpg b/bin/data/samples/58.jpg
similarity index 100%
rename from bin/data/090206-3/58.jpg
rename to bin/data/samples/58.jpg
diff --git a/bin/data/090206-3/59.jpg b/bin/data/samples/59.jpg
similarity index 100%
rename from bin/data/090206-3/59.jpg
rename to bin/data/samples/59.jpg
diff --git a/bin/data/090206-3/6.jpg b/bin/data/samples/6.jpg
similarity index 100%
rename from bin/data/090206-3/6.jpg
rename to bin/data/samples/6.jpg
diff --git a/bin/data/090206-3/60.jpg b/bin/data/samples/60.jpg
similarity index 100%
rename from bin/data/090206-3/60.jpg
rename to bin/data/samples/60.jpg
diff --git a/bin/data/090206-3/61.jpg b/bin/data/samples/61.jpg
similarity index 100%
rename from bin/data/090206-3/61.jpg
rename to bin/data/samples/61.jpg
diff --git a/bin/data/090206-3/62.jpg b/bin/data/samples/62.jpg
similarity index 100%
rename from bin/data/090206-3/62.jpg
rename to bin/data/samples/62.jpg
diff --git a/bin/data/090206-3/63.jpg b/bin/data/samples/63.jpg
similarity index 100%
rename from bin/data/090206-3/63.jpg
rename to bin/data/samples/63.jpg
diff --git a/bin/data/090206-3/64.jpg b/bin/data/samples/64.jpg
similarity index 100%
rename from bin/data/090206-3/64.jpg
rename to bin/data/samples/64.jpg
diff --git a/bin/data/090206-3/65.jpg b/bin/data/samples/65.jpg
similarity index 100%
rename from bin/data/090206-3/65.jpg
rename to bin/data/samples/65.jpg
diff --git a/bin/data/090206-3/66.jpg b/bin/data/samples/66.jpg
similarity index 100%
rename from bin/data/090206-3/66.jpg
rename to bin/data/samples/66.jpg
diff --git a/bin/data/090206-3/67.jpg b/bin/data/samples/67.jpg
similarity index 100%
rename from bin/data/090206-3/67.jpg
rename to bin/data/samples/67.jpg
diff --git a/bin/data/090206-3/68.jpg b/bin/data/samples/68.jpg
similarity index 100%
rename from bin/data/090206-3/68.jpg
rename to bin/data/samples/68.jpg
diff --git a/bin/data/090206-3/69.jpg b/bin/data/samples/69.jpg
similarity index 100%
rename from bin/data/090206-3/69.jpg
rename to bin/data/samples/69.jpg
diff --git a/bin/data/090206-3/7.jpg b/bin/data/samples/7.jpg
similarity index 100%
rename from bin/data/090206-3/7.jpg
rename to bin/data/samples/7.jpg
diff --git a/bin/data/090206-3/70.jpg b/bin/data/samples/70.jpg
similarity index 100%
rename from bin/data/090206-3/70.jpg
rename to bin/data/samples/70.jpg
diff --git a/bin/data/090206-3/71.jpg b/bin/data/samples/71.jpg
similarity index 100%
rename from bin/data/090206-3/71.jpg
rename to bin/data/samples/71.jpg
diff --git a/bin/data/090206-3/72.jpg b/bin/data/samples/72.jpg
similarity index 100%
rename from bin/data/090206-3/72.jpg
rename to bin/data/samples/72.jpg
diff --git a/bin/data/090206-3/73.jpg b/bin/data/samples/73.jpg
similarity index 100%
rename from bin/data/090206-3/73.jpg
rename to bin/data/samples/73.jpg
diff --git a/bin/data/090206-3/74.jpg b/bin/data/samples/74.jpg
similarity index 100%
rename from bin/data/090206-3/74.jpg
rename to bin/data/samples/74.jpg
diff --git a/bin/data/090206-3/75.jpg b/bin/data/samples/75.jpg
similarity index 100%
rename from bin/data/090206-3/75.jpg
rename to bin/data/samples/75.jpg
diff --git a/bin/data/090206-3/76.jpg b/bin/data/samples/76.jpg
similarity index 100%
rename from bin/data/090206-3/76.jpg
rename to bin/data/samples/76.jpg
diff --git a/bin/data/090206-3/77.jpg b/bin/data/samples/77.jpg
similarity index 100%
rename from bin/data/090206-3/77.jpg
rename to bin/data/samples/77.jpg
diff --git a/bin/data/090206-3/78.jpg b/bin/data/samples/78.jpg
similarity index 100%
rename from bin/data/090206-3/78.jpg
rename to bin/data/samples/78.jpg
diff --git a/bin/data/090206-3/79.jpg b/bin/data/samples/79.jpg
similarity index 100%
rename from bin/data/090206-3/79.jpg
rename to bin/data/samples/79.jpg
diff --git a/bin/data/090206-3/8.jpg b/bin/data/samples/8.jpg
similarity index 100%
rename from bin/data/090206-3/8.jpg
rename to bin/data/samples/8.jpg
diff --git a/bin/data/090206-3/80.jpg b/bin/data/samples/80.jpg
similarity index 100%
rename from bin/data/090206-3/80.jpg
rename to bin/data/samples/80.jpg
diff --git a/bin/data/090206-3/81.jpg b/bin/data/samples/81.jpg
similarity index 100%
rename from bin/data/090206-3/81.jpg
rename to bin/data/samples/81.jpg
diff --git a/bin/data/090206-3/82.jpg b/bin/data/samples/82.jpg
similarity index 100%
rename from bin/data/090206-3/82.jpg
rename to bin/data/samples/82.jpg
diff --git a/bin/data/090206-3/83.jpg b/bin/data/samples/83.jpg
similarity index 100%
rename from bin/data/090206-3/83.jpg
rename to bin/data/samples/83.jpg
diff --git a/bin/data/090206-3/84.jpg b/bin/data/samples/84.jpg
similarity index 100%
rename from bin/data/090206-3/84.jpg
rename to bin/data/samples/84.jpg
diff --git a/bin/data/090206-3/9.jpg b/bin/data/samples/9.jpg
similarity index 100%
rename from bin/data/090206-3/9.jpg
rename to bin/data/samples/9.jpg
diff --git a/bin/data/090206-3_GT.bmp b/bin/data/samples_GT.bmp
similarity index 100%
rename from bin/data/090206-3_GT.bmp
rename to bin/data/samples_GT.bmp
diff --git a/corelib/tests/Tests.cpp b/corelib/tests/Tests.cpp
index de651a6e..2a3dd35d 100644
--- a/corelib/tests/Tests.cpp
+++ b/corelib/tests/Tests.cpp
@@ -62,7 +62,7 @@ void Tests::testAvpd()
 	//Logger::setLevel(Logger::kDebug);
 	//Logger::setType(Logger::kTypeInvalid);
 
-	std::string path = "./data/090206-3";
+	std::string path = "./data/samples";
 
 	CameraImages camera(path);
 	CPPUNIT_ASSERT_MESSAGE("Camera initialization failed!\n", camera.init());
@@ -167,7 +167,7 @@ void Tests::testCamera()
 	CPPUNIT_ASSERT( count == 10 );*/
 
 	//CameraImages class
-	path = "data/090206-3";
+	path = "data/samples";
 	CameraImages cameraImages(path, false, 0, false, 80);
 	CPPUNIT_ASSERT( cameraImages.init() );
 	CPPUNIT_ASSERT( cameraImages.isIdle() == true);
@@ -182,7 +182,7 @@ void Tests::testCamera()
 	CPPUNIT_ASSERT( count == 5 );
 
 	//CameraDatabase class
-	path = "./data/090206-3.db";
+	path = "./data/samples.db";
 	CameraDatabase cameraDatabase(path, false); // ignoreChildren=false;
 	CPPUNIT_ASSERT( cameraDatabase.init() );
 	CPPUNIT_ASSERT( cameraDatabase.isIdle() == true);
@@ -325,7 +325,7 @@ void Tests::testKeypointMemory()
 	parameters.insert(ParametersPair(Parameters::kKpTfIdfLikelihoodUsed(), "true"));
 	mem.setCommonSignatureUsed(true);
 	mem.setMaxStMemSize(1);
-	mem.init("sqlite3", "./data/090206-3.db", false, parameters);
+	mem.init("sqlite3", "./data/samples.db", false, parameters);
 	//ULOGGER_INFO("mem.getStMemIds().size() = %d, mem.getStMemIds().size()=%d", mem.getWorkingMemIds().size(), mem.getStMemIds().size());
 	CPPUNIT_ASSERT( mem.getWorkingMem().size() + mem.getStMem().size() == 83 );