diff --git a/src/Mod/TechDraw/App/DrawPagePyImp.cpp b/src/Mod/TechDraw/App/DrawPagePyImp.cpp
index 71bcf3d59..3574a1dae 100644
--- a/src/Mod/TechDraw/App/DrawPagePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawPagePyImp.cpp
@@ -2,8 +2,8 @@
 #include "PreCompiled.h"
 #include <Base/Console.h>
 
-#include "Mod/Drawing/App/DrawPage.h"
-#include "Mod/Drawing/App/DrawView.h"
+#include "Mod/TechDraw/App/DrawPage.h"
+#include "Mod/TechDraw/App/DrawView.h"
 #include "DrawViewPy.h"
 
 // inclusion of the generated files (generated out of DrawPagePy.xml)
diff --git a/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
index 7cc068c58..acf5ef6c5 100644
--- a/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
@@ -25,7 +25,7 @@
 # include <sstream>
 #endif
 
-#include "Mod/Drawing/App/DrawParametricTemplate.h"
+#include "Mod/TechDraw/App/DrawParametricTemplate.h"
 
 // inclusion of the generated files (generated out of DrawParametricTemplateSFPy.xml)
 #include "DrawParametricTemplatePy.h"
@@ -67,7 +67,7 @@ int DrawParametricTemplatePy::setCustomAttributes(const char* attr, PyObject* ob
 
 PyObject* DrawParametricTemplatePy::drawLine(PyObject *args)
 {
-    PyObject *pcObj;
+    //PyObject *pcObj;
     double x1, y1;
     double x2, y2;
 
diff --git a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp
index 4cf19bff9..3a28a48e4 100644
--- a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp
@@ -1,7 +1,7 @@
 
 #include "PreCompiled.h"
 
-#include "Mod/Drawing/App/DrawSVGTemplate.h"
+#include "Mod/TechDraw/App/DrawSVGTemplate.h"
 
 // inclusion of the generated files (generated out of DrawSVGTemplatePy.xml)
 #include "DrawSVGTemplatePy.h"
diff --git a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
index 723aff993..53e09bf03 100644
--- a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
@@ -25,7 +25,7 @@
 # include <sstream>
 #endif
 
-#include "Mod/Drawing/App/DrawTemplate.h"
+#include "Mod/TechDraw/App/DrawTemplate.h"
 
 // inclusion of the generated files (generated out of DrawTemplateSFPy.xml)
 #include "DrawTemplatePy.h"
diff --git a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
index 61d365065..6328e60ad 100644
--- a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
@@ -1,7 +1,7 @@
 
 #include "PreCompiled.h"
 
-#include "Mod/Drawing/App/DrawViewPart.h"
+#include "Mod/TechDraw/App/DrawViewPart.h"
 
 // inclusion of the generated files (generated out of DrawViewPartPy.xml)
 #include "DrawViewPartPy.h"
diff --git a/src/Mod/TechDraw/App/DrawViewPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPyImp.cpp
index 4bc0ef903..dab0ac493 100644
--- a/src/Mod/TechDraw/App/DrawViewPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewPyImp.cpp
@@ -1,7 +1,7 @@
 
 #include "PreCompiled.h"
 
-#include "Mod/Drawing/App/DrawView.h"
+#include "Mod/TechDraw/App/DrawView.h"
 
 // inclusion of the generated files (generated out of DrawViewPy.xml)
 #include "DrawViewPy.h"
diff --git a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp
index 85f025059..68892ee0b 100644
--- a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp
@@ -1,9 +1,9 @@
 
 #include "PreCompiled.h"
 
-#include "Mod/Drawing/App/DrawViewSymbol.h"
-#include "Mod/Drawing/App/DrawView.h"
-#include "Mod/Drawing/App/DrawViewPy.h"
+#include "Mod/TechDraw/App/DrawViewSymbol.h"
+#include "Mod/TechDraw/App/DrawView.h"
+#include "Mod/TechDraw/App/DrawViewPy.h"
 
 // inclusion of the generated files (generated out of DrawViewSymbolPy.xml)
 #include "DrawViewSymbolPy.h"
diff --git a/src/Mod/TechDraw/App/Makefile.am b/src/Mod/TechDraw/App/Makefile.am
index 2d56bef31..f2d91d917 100644
--- a/src/Mod/TechDraw/App/Makefile.am
+++ b/src/Mod/TechDraw/App/Makefile.am
@@ -80,7 +80,7 @@ Drawing_la_DEPENDENCIES = libDrawing.la
 AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(OCC_INC) $(all_includes)
 
 
-libdir = $(prefix)/Mod/Drawing
+libdir = $(prefix)/Mod/TechDraw
 
 EXTRA_DIST = \
 		CMakeLists.txt
diff --git a/src/Mod/TechDraw/CMakeLists.txt b/src/Mod/TechDraw/CMakeLists.txt
index fcdadfe20..a588a4ccf 100644
--- a/src/Mod/TechDraw/CMakeLists.txt
+++ b/src/Mod/TechDraw/CMakeLists.txt
@@ -10,19 +10,15 @@ INSTALL(
     FILES
         Init.py
         InitGui.py
-        DrawingAlgos.py
-        DrawingExample.py
-        DrawingTests.py
-        DrawingPatterns.py
     DESTINATION
-        Mod/Drawing
+        Mod/TechDraw
 )
 
 INSTALL(
     DIRECTORY
         Templates
     DESTINATION
-        ${CMAKE_INSTALL_DATADIR}/Mod/Drawing
+        ${CMAKE_INSTALL_DATADIR}/Mod/TechDraw
     FILES_MATCHING 
         PATTERN "*.svg*"
         PATTERN "*.dxf*"
diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
index 48877637f..7e943489c 100644
--- a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
+++ b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
@@ -29,9 +29,9 @@
 #endif
 
 #include "MDIViewPage.h"
-#include <Mod/Drawing/App/DrawPage.h>
-#include <Mod/Drawing/App/DrawViewPart.h>
-#include <Mod/Drawing/App/ProjectionAlgos.h>
+#include <Mod/TechDraw/App/DrawPage.h>
+#include <Mod/TechDraw/App/DrawViewPart.h>
+//#include <Mod/Drawing/App/ProjectionAlgos.h>
 #include <Mod/Part/App/PartFeature.h>
 
 #include <Base/Console.h>
@@ -45,7 +45,7 @@
 
 using namespace TechDrawGui;
 
-
+//TODO: TechDraw does not open/import/export SVG/DXF files.  Not sure what belongs here.
 /* module functions */
 static PyObject *
 open(PyObject *self, PyObject *args)
@@ -174,6 +174,7 @@ exporter(PyObject *self, PyObject *args)
                                 }
                                 TopoDS_Shape shape = static_cast<Part::Feature*>(link)->Shape.getShape()._Shape;
                                 if (!shape.IsNull()) {
+#if 0
                                     Base::Vector3d dir = view->Direction.getValue();
                                     bool hidden = view->ShowHiddenLines.getValue();
                                     bool smooth = view->ShowSmoothLines.getValue();
@@ -185,6 +186,7 @@ exporter(PyObject *self, PyObject *args)
 
                                     Drawing::ProjectionAlgos project(shape, dir);
                                     str_out << project.getDXF(type, scale, tol);
+#endif
                                     break; // TODO: How to add several shapes?
                                 }
                             }
diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt
index 5dca4481a..aa8242fc2 100644
--- a/src/Mod/TechDraw/Gui/CMakeLists.txt
+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt
@@ -41,14 +41,13 @@ set(TechDrawGui_MOC_HDRS
     QGIViewSymbol.h
     QGIViewClip.h
     TaskProjGroup.h
-    TemplateTextField.h
     DlgPrefsDrawingImp.h
 )
 
 fc_wrap_cpp(TechDrawGui_MOC_SRCS ${TechDrawGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${TechDrawGui_MOC_SRCS})
 
-qt4_add_resources(TechDrawGui_SRCS Resources/Drawing.qrc)
+qt4_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc)
 
 set(TechDrawGui_UIC_SRCS
     DlgPrefsDrawing.ui
@@ -64,7 +63,7 @@ SET(TechDrawGui_SRCS
     Command.cpp
     CommandCreateDims.cpp
     CommandDecorate.cpp
-    Resources/Drawing.qrc
+    Resources/TechDraw.qrc
     PreCompiled.cpp
     PreCompiled.h
     Workbench.cpp
@@ -173,19 +172,19 @@ add_library(TechDrawGui SHARED ${TechDrawGui_SRCS} ${TechDrawGuiView_SRCS} ${Tec
 target_link_libraries(TechDrawGui ${TechDrawGui_LIBS})
 
 fc_target_copy_resource(TechDrawGui
-    ${CMAKE_SOURCE_DIR}/src/Mod/Drawing
-    ${CMAKE_BINARY_DIR}/Mod/Drawing
+    ${CMAKE_SOURCE_DIR}/src/Mod/TechDraw
+    ${CMAKE_BINARY_DIR}/Mod/TechDraw
     InitGui.py)
 
 SET(TechDrawGuiIcon_SVG
     Resources/icons/preferences-drawing.svg
 )
 
-fc_copy_sources(TechDrawGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Drawing" ${TechDrawGuiIcon_SVG})
+fc_copy_sources(TechDrawGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw" ${TechDrawGuiIcon_SVG})
 
-INSTALL(FILES ${TechDrawGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/DrawingFem/Resources/icons")
+INSTALL(FILES ${TechDrawGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/TechDraw/Resources/icons")
 
-SET_BIN_DIR(TechDrawGui TechDrawGui /Mod/Drawing)
+SET_BIN_DIR(TechDrawGui TechDrawGui /Mod/TechDraw)
 SET_PYTHON_PREFIX_SUFFIX(TechDrawGui)
 
 INSTALL(TARGETS TechDrawGui DESTINATION ${CMAKE_INSTALL_LIBDIR})