diff --git a/src/Mod/Surface/App/Makefile.am b/src/Mod/Surface/App/Makefile.am
deleted file mode 100644
index b005c7d443..0000000000
--- a/src/Mod/Surface/App/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-
-lib_LTLIBRARIES=libSurface.la Surface.la
-
-libSurface_la_SOURCES=\
-		AppSurfacePy.cpp \
-		PreCompiled.cpp \
-		PreCompiled.h
-
-includedir = @includedir@/Mod/Surface/App
-
-# the library search path.
-libSurface_la_LDFLAGS = -L../../../Base -L../../../App $(all_libraries) \
-		-version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
-libSurface_la_CPPFLAGS = -DSurfaceAppExport=
-
-libSurface_la_LIBADD   = \
-		@BOOST_SYSTEM_LIB@ \
-		-l@PYTHON_LIB@ \
-		-lxerces-c \
-		-lFreeCADBase \
-		-lFreeCADApp
-
-#--------------------------------------------------------------------------------------
-# Loader of libSurface
-
-Surface_la_SOURCES=\
-		AppSurface.cpp
-
-# the library search path.
-Surface_la_LDFLAGS = $(libSurface_la_LDFLAGS) -module -avoid-version
-Surface_la_CPPFLAGS = $(libSurface_la_CPPFLAGS)
-
-Surface_la_LIBADD   = \
-		$(libSurface_la_LIBADD) \
-		-lSurface
-
-Surface_la_DEPENDENCIES = libSurface.la
-
-#--------------------------------------------------------------------------------------
-
-# set the include path found by configure
-AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes)
-
-libdir = $(prefix)/Mod/Surface
-
-EXTRA_DIST = \
-		CMakeLists.txt
diff --git a/src/Mod/Surface/Gui/Makefile.am b/src/Mod/Surface/Gui/Makefile.am
deleted file mode 100644
index b42e7e08b6..0000000000
--- a/src/Mod/Surface/Gui/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-
-lib_LTLIBRARIES=libSurfaceGui.la SurfaceGui.la
-
-BUILT_SOURCES=
-
-libSurfaceGui_la_SOURCES=\
-		AppSurfaceGuiPy.cpp \
-		Command.cpp \
-		PreCompiled.cpp \
-		PreCompiled.h \
-		Workbench.cpp \
-		Workbench.h
-
-includedir = @includedir@/Mod/Surface/Gui
-
-# the library search path.
-libSurfaceGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App \
-		$(QT_LIBS) $(all_libraries) \
-		$(sim_ac_coin_ldflags) $(sim_ac_coin_libs) \
-		$(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \
-		-version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
-
-libSurfaceGui_la_CPPFLAGS = -DSurfaceAppExport= -DSurfaceGuiExport=
-
-libSurfaceGui_la_LIBADD   = \
-		@BOOST_SYSTEM_LIB@ \
-		-l@PYTHON_LIB@ \
-		-lxerces-c \
-		-lFreeCADBase \
-		-lFreeCADApp \
-		-lFreeCADGui \
-		-lSurface
-
-#--------------------------------------------------------------------------------------
-# Loader of libSurfaceGui
-
-SurfaceGui_la_SOURCES=\
-		AppSurfaceGui.cpp
-
-# the library search path.
-SurfaceGui_la_LDFLAGS = $(libSurfaceGui_la_LDFLAGS) -module -avoid-version
-SurfaceGui_la_CPPFLAGS = $(libSurfaceGui_la_CPPFLAGS)
-
-SurfaceGui_la_LIBADD   = \
-		$(libSurfaceGui_la_LIBADD) \
-		-lSurfaceGui
-
-SurfaceGui_la_DEPENDENCIES = libSurfaceGui.la
-
-#--------------------------------------------------------------------------------------
-
-# rule for Qt MetaObject Compiler:
-moc_%.cpp: %.h
-	$(QT_MOC) $< -o $(@F)
-
-# rule for Qt MetaObject Compiler:
-%.moc: %.h
-	$(QT_MOC) $< -o $(@F)
-
-# rules for Qt User Interface Compiler:
-ui_%.h: %.ui
-	$(QT_UIC) $< -o $(@F)
-
-# rules for Qt Resource Compiler:
-qrc_%.cpp: Resources/%.qrc
-	$(QT_RCC) -name $(*F) $< -o $(@F)
-
-# set the include path found by configure
-AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) \
-		-I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir)
-
-libdir = $(prefix)/Mod/Surface
-
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-		CMakeLists.txt \
-		Resources/Surface.qrc
-
diff --git a/src/Mod/Surface/Gui/qrc_Surface.cxx b/src/Mod/Surface/Gui/qrc_Surface.cxx
deleted file mode 100644
index 6d95ae475b..0000000000
--- a/src/Mod/Surface/Gui/qrc_Surface.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/****************************************************************************
-** Resource object code
-**
-** Created: Tue Aug 5 22:27:13 2014
-**      by: The Resource Compiler for Qt version 4.8.1
-**
-** WARNING! All changes made in this file will be lost!
-*****************************************************************************/
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-QT_END_NAMESPACE
-
-
-int QT_MANGLE_NAMESPACE(qInitResources_Surface)()
-{
-    return 1;
-}
-
-Q_CONSTRUCTOR_FUNCTION(QT_MANGLE_NAMESPACE(qInitResources_Surface))
-
-int QT_MANGLE_NAMESPACE(qCleanupResources_Surface)()
-{
-    return 1;
-}
-
-Q_DESTRUCTOR_FUNCTION(QT_MANGLE_NAMESPACE(qCleanupResources_Surface))
-
diff --git a/src/Mod/Surface/Makefile.am b/src/Mod/Surface/Makefile.am
deleted file mode 100644
index 4603016119..0000000000
--- a/src/Mod/Surface/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS=App Gui
-
-# Change data dir from default ($(prefix)/share) to $(prefix)
-datadir = $(prefix)/Mod/Surface
-data_DATA = Init.py InitGui.py
-
-EXTRA_DIST = \
-		$(data_DATA) \
-		CMakeLists.txt \
-		Surface.dox