diff --git a/tools/sdbus++ b/tools/sdbus++
index 76998c9..6b0a15c 100755
--- a/tools/sdbus++
+++ b/tools/sdbus++
@@ -3,6 +3,7 @@
 import mako.lookup
 import argparse
 import sys
+import os
 
 
 def main():
@@ -16,8 +17,8 @@
     parser.add_argument('-r', '--rootdir', dest='rootdir', default='example',
                         type=str, help='Location of files to process.')
     parser.add_argument('-t', '--templatedir', dest='templatedir',
-                        default='templates', type=str,
-                        help='Location of templates files.')
+                        default=os.path.join('sdbusplus', 'templates'),
+                        type=str, help='Location of templates files.')
     parser.add_argument('typeName', metavar='TYPE', type=str,
                         choices=valid_types.keys(), help='Type to operate on.')
     parser.add_argument('process', metavar='PROCESS', type=str,
diff --git a/tools/templates/interface.mako.md b/tools/sdbusplus/templates/interface.mako.md
similarity index 100%
rename from tools/templates/interface.mako.md
rename to tools/sdbusplus/templates/interface.mako.md
diff --git a/tools/templates/interface.mako.server.cpp b/tools/sdbusplus/templates/interface.mako.server.cpp
similarity index 100%
rename from tools/templates/interface.mako.server.cpp
rename to tools/sdbusplus/templates/interface.mako.server.cpp
diff --git a/tools/templates/interface.mako.server.hpp b/tools/sdbusplus/templates/interface.mako.server.hpp
similarity index 100%
rename from tools/templates/interface.mako.server.hpp
rename to tools/sdbusplus/templates/interface.mako.server.hpp
diff --git a/tools/templates/method.mako.md b/tools/sdbusplus/templates/method.mako.md
similarity index 100%
rename from tools/templates/method.mako.md
rename to tools/sdbusplus/templates/method.mako.md
diff --git a/tools/templates/method.mako.prototype.hpp b/tools/sdbusplus/templates/method.mako.prototype.hpp
similarity index 100%
rename from tools/templates/method.mako.prototype.hpp
rename to tools/sdbusplus/templates/method.mako.prototype.hpp
diff --git a/tools/templates/property.mako.md b/tools/sdbusplus/templates/property.mako.md
similarity index 100%
rename from tools/templates/property.mako.md
rename to tools/sdbusplus/templates/property.mako.md
diff --git a/tools/templates/signal.mako.md b/tools/sdbusplus/templates/signal.mako.md
similarity index 100%
rename from tools/templates/signal.mako.md
rename to tools/sdbusplus/templates/signal.mako.md
diff --git a/tools/templates/signal.mako.prototype.hpp b/tools/sdbusplus/templates/signal.mako.prototype.hpp
similarity index 100%
rename from tools/templates/signal.mako.prototype.hpp
rename to tools/sdbusplus/templates/signal.mako.prototype.hpp