diff --git a/scripts/Core/LineConveyor/CommentRemover.py b/scripts/Core/LineConveyor/CommentRemover.py
new file mode 100644
index 0000000..6624671
--- /dev/null
+++ b/scripts/Core/LineConveyor/CommentRemover.py
@@ -0,0 +1,6 @@
+class CommentRemover:
+	def processLine(self, line):
+		assert line is not None
+
+
+
diff --git a/scripts/Core/LineConveyor/Stripper.py b/scripts/Core/LineConveyor/Stripper.py
new file mode 100644
index 0000000..9b57bee
--- /dev/null
+++ b/scripts/Core/LineConveyor/Stripper.py
@@ -0,0 +1,5 @@
+class Stripper:
+	def processLine(self, line):
+		assert line is not None
+
+		return line.strip(' \t\n\r')
diff --git a/scripts/StepRunner/__init__.py b/scripts/Core/LineConveyor/__init__.py
similarity index 100%
rename from scripts/StepRunner/__init__.py
rename to scripts/Core/LineConveyor/__init__.py
diff --git a/scripts/StepRunner/StepsRunner.py b/scripts/Core/StepsRunner.py
similarity index 100%
rename from scripts/StepRunner/StepsRunner.py
rename to scripts/Core/StepsRunner.py
diff --git a/scripts/Core/__init__.py b/scripts/Core/__init__.py
new file mode 100644
index 0000000..cc31abc
--- /dev/null
+++ b/scripts/Core/__init__.py
@@ -0,0 +1 @@
+__author__ = 'rzaitov'
diff --git a/scripts/Tests/UnitTests/LineConveyor/__init__.py b/scripts/Tests/UnitTests/LineConveyor/__init__.py
new file mode 100644
index 0000000..cc31abc
--- /dev/null
+++ b/scripts/Tests/UnitTests/LineConveyor/__init__.py
@@ -0,0 +1 @@
+__author__ = 'rzaitov'
diff --git a/scripts/Tests/UnitTests/LineConveyor/test_stripper.py b/scripts/Tests/UnitTests/LineConveyor/test_stripper.py
new file mode 100644
index 0000000..75057be
--- /dev/null
+++ b/scripts/Tests/UnitTests/LineConveyor/test_stripper.py
@@ -0,0 +1,13 @@
+import unittest
+from Core.LineConveyor.Stripper import Stripper
+
+
+class TestStripper(unittest.TestCase):
+	def setUp(self):
+		self.stripper = Stripper()
+
+	def test_stripLine(self):
+		line = '  \tSome text \t\r\n'
+		newLine = self.stripper.processLine(line)
+
+		self.assertEqual('Some text', newLine)
\ No newline at end of file
diff --git a/scripts/taskRunner.py b/scripts/taskRunner.py
index f9f73a3..7485576 100644
--- a/scripts/taskRunner.py
+++ b/scripts/taskRunner.py
@@ -9,7 +9,7 @@ baseDir = os.path.join(scriptDir, os.pardir)
 
 os.chdir(baseDir)
 
-from StepRunner.StepsRunner import StepsRunner
+from Core.StepsRunner import StepsRunner
 
 
 class TaskRunner: