diff --git a/ld2dap/Filter.py b/ld2dap/core/Filter.py
similarity index 85%
rename from ld2dap/Filter.py
rename to ld2dap/core/Filter.py
index 9f1bde2..916340e 100644
--- a/ld2dap/Filter.py
+++ b/ld2dap/core/Filter.py
@@ -8,8 +8,8 @@
 #
 # TODO details
 
-from Input import Input
-from Output import Output
+from .Input import Input
+from .Output import Output
 
 class Filter(Output, Input):
     """Output should be first"""
diff --git a/ld2dap/Input.py b/ld2dap/core/Input.py
similarity index 79%
rename from ld2dap/Input.py
rename to ld2dap/core/Input.py
index 3070193..7475067 100644
--- a/ld2dap/Input.py
+++ b/ld2dap/core/Input.py
@@ -8,7 +8,7 @@
 #
 # TODO details
 
-from Node import Node
+from .Node import Node
 
 class Input(Node):
     def __init__(self, name='__CHILD__'):
@@ -17,6 +17,3 @@ class Input(Node):
 
     def register(self, output):
         self.outputs.append(output)
-
-    def _run(self):
-        print('I RUN ADSAOADIQJOWDOASJDOQIJWDOIJQOWIDJO')
diff --git a/ld2dap/Node.py b/ld2dap/core/Node.py
similarity index 100%
rename from ld2dap/Node.py
rename to ld2dap/core/Node.py
diff --git a/ld2dap/Output.py b/ld2dap/core/Output.py
similarity index 93%
rename from ld2dap/Output.py
rename to ld2dap/core/Output.py
index 76826c5..dbd6df3 100644
--- a/ld2dap/Output.py
+++ b/ld2dap/core/Output.py
@@ -8,8 +8,9 @@
 #
 # TODO details
 
-from Node import Node
-from Input import Input
+#from . import Node, Input
+from .Node import Node
+from .Input import Input
 
 class Output(Node):
     def __init__(self, name='__CHILD__'):
diff --git a/ld2dap/core/__init__.py b/ld2dap/core/__init__.py
new file mode 100644
index 0000000..ac7bdea
--- /dev/null
+++ b/ld2dap/core/__init__.py
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# \file %filename%.py
+# \brief TODO
+# \author Florent Guiotte <florent.guiotte@gmail.com>
+# \version 0.1
+# \date 04 avril 2018
+#
+# TODO details
+
+from .Output import Output
+from .Input import Input
+from .Filter import Filter
diff --git a/ld2dap/test.py b/ld2dap/test.py
index 498ff7b..0d70d47 100644
--- a/ld2dap/test.py
+++ b/ld2dap/test.py
@@ -8,10 +8,7 @@
 #
 # TODO details
 
-from Node import Node
-from Filter import Filter
-from Input import Input
-from Output import Output
+from core import Input, Output, Filter
 
 def main():
     i = Input()