--- a/src/CMakeLists.txt	Mon Dec 10 00:06:54 2018 +0100
+++ b/src/CMakeLists.txt	Mon Dec 10 15:19:14 2018 +0100
@@ -30,7 +30,6 @@
 # Executable output:
 add_executable(
 	${EXECUTABLE_FILE}
-	PassthroughHandler.h
 	relpipe-tr-grep.cpp
 )
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/GrepHandler.h	Mon Dec 10 15:19:14 2018 +0100
@@ -0,0 +1,75 @@
+/**
+ * Relational pipes
+ * Copyright © 2018 František Kučera (Frantovo.cz, GlobalCode.info)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+#include <iostream>
+#include <sstream>
+#include <locale>
+#include <codecvt>
+#include <regex>
+
+#include <relpipe/reader/typedefs.h>
+#include <relpipe/reader/TypeId.h>
+#include <relpipe/reader/handlers/RelationalReaderStringHandler.h>
+#include <relpipe/reader/handlers/AttributeMetadata.h>
+
+#include <relpipe/writer/Factory.h>
+
+namespace relpipe {
+namespace tr {
+namespace grep {
+
+using namespace relpipe;
+using namespace relpipe::reader;
+using namespace relpipe::reader::handlers;
+
+class GrepHandler : public RelationalReaderStringHadler {
+private:
+	std::shared_ptr<writer::RelationalWriter> relationalWriter;
+public:
+
+	GrepHandler(std::ostream& output) {
+		relationalWriter.reset(writer::Factory::create(output));
+	}
+
+	void startRelation(string_t name, std::vector<AttributeMetadata> attributes) override {
+		// TODO: move to a reusable method (or use same metadata on both reader and writer side?)
+		std::vector<writer::AttributeMetadata> writerMetadata;
+		for (AttributeMetadata readerMetadata : attributes) {
+			writerMetadata.push_back({readerMetadata.getAttributeName(), relationalWriter->toTypeId(readerMetadata.getTypeName())});
+		}
+		
+		relationalWriter->startRelation(name, writerMetadata, true);
+	}
+
+	void attribute(const string_t& value) override {
+		relationalWriter->writeAttribute(value);
+	}
+
+	void endOfPipe() {
+
+	}
+
+};
+
+}
+}
+}

--- a/src/PassthroughHandler.h	Mon Dec 10 00:06:54 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/**
- * Relational pipes
- * Copyright © 2018 František Kučera (Frantovo.cz, GlobalCode.info)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include <memory>
-#include <string>
-#include <vector>
-#include <iostream>
-#include <sstream>
-#include <locale>
-#include <codecvt>
-#include <regex>
-
-#include <relpipe/reader/typedefs.h>
-#include <relpipe/reader/TypeId.h>
-#include <relpipe/reader/handlers/RelationalReaderStringHandler.h>
-#include <relpipe/reader/handlers/AttributeMetadata.h>
-
-#include <relpipe/writer/Factory.h>
-
-namespace relpipe {
-namespace tr {
-namespace validator {
-
-using namespace relpipe;
-using namespace relpipe::reader;
-using namespace relpipe::reader::handlers;
-
-// TODO: use rather RelationalReaderStringHadler
-class PassthroughHandler : public RelationalReaderStringHadler {
-private:
-	writer::RelationalWriter* relationalWriter;
-public:
-
-	PassthroughHandler(std::ostream& output) : relationalWriter(writer::Factory::create(output)) {
-	}
-
-	virtual ~PassthroughHandler() {
-		delete relationalWriter;
-	}
-
-	void startRelation(string_t name, std::vector<AttributeMetadata> attributes) override {
-		// TODO: move to a reusable method (or use same metadata on both reader and writer side?)
-		std::vector<writer::AttributeMetadata> writerMetadata;
-		for (AttributeMetadata readerMetadata : attributes) {
-			writerMetadata.push_back({readerMetadata.getAttributeName(), relationalWriter->toTypeId(readerMetadata.getTypeName())});
-		}
-		
-		relationalWriter->startRelation(name, writerMetadata, true);
-	}
-
-	void attribute(const string_t& value) override {
-		relationalWriter->writeAttribute(value);
-	}
-
-	void endOfPipe() {
-
-	}
-
-};
-
-}
-}
-}

--- a/src/relpipe-tr-grep.cpp	Mon Dec 10 00:06:54 2018 +0100
+++ b/src/relpipe-tr-grep.cpp	Mon Dec 10 15:19:14 2018 +0100
@@ -32,11 +32,11 @@
 #include <relpipe/writer/Factory.h>
 #include <relpipe/writer/TypeId.h>
 
-#include "PassthroughHandler.h"
+#include "GrepHandler.h"
 
 using namespace relpipe::cli;
 using namespace relpipe::reader;
-using namespace relpipe::tr::validator;
+using namespace relpipe::tr::grep;
 
 int main(int argc, char**argv) {
 	setlocale(LC_ALL, "");
@@ -47,7 +47,7 @@
 
 	try {
 		std::shared_ptr<RelationalReader> reader(Factory::create(std::cin));
-		PassthroughHandler handler(std::cout);
+		GrepHandler handler(std::cout);
 		reader->addHandler(&handler);
 		reader->process();