diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 4822ac28ba..11663c684f 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -27,6 +27,7 @@ include_directories(
     ../common
     ../polygon
     ../common/dialogs
+    ./exporters
     ../lib_dxf
     ./import_dxf
     ${INC_AFTER}
@@ -125,6 +126,18 @@ set( PCBNEW_IMPORT_DXF
     import_dxf/dxf2brd_items.cpp
     )
 
+set( PCBNEW_EXPORTERS
+    exporters/export_d356.cpp
+    exporters/export_gencad.cpp
+    exporters/export_idf.cpp
+    exporters/export_vrml.cpp
+    exporters/idf.cpp
+    exporters/gen_drill_report_files.cpp
+    exporters/gen_modules_placefile.cpp
+    exporters/gendrill_Excellon_writer.cpp
+    exporters/vrml_board.cpp
+    )
+
 set( PCBNEW_AUTOROUTER_SRCS
     autorouter/rect_placement/rect_placement.cpp
     autorouter/move_and_route_event_functions.cpp
@@ -159,6 +172,7 @@ set( PCBNEW_CLASS_SRCS
     deltrack.cpp
     ${PCBNEW_DIALOGS}
     ${PCBNEW_IMPORT_DXF}
+    ${PCBNEW_EXPORTERS}
     dragsegm.cpp
     drc.cpp
     drc_clearance_test_functions.cpp
@@ -173,21 +187,12 @@ set( PCBNEW_CLASS_SRCS
     edit_track_width.cpp
     edtxtmod.cpp
     event_handlers_tracks_vias_sizes.cpp
-    export_d356.cpp
-    export_gencad.cpp
-    export_idf.cpp
-    export_vrml.cpp
-    vrml_board.cpp
     files.cpp
-    gen_drill_report_files.cpp
-    gen_modules_placefile.cpp
-    gendrill_Excellon_writer.cpp
     globaleditpad.cpp
     highlight.cpp
     hotkeys.cpp
     hotkeys_board_editor.cpp
     hotkeys_module_editor.cpp
-    idf.cpp
     initpcb.cpp
     layer_widget.cpp
     librairi.cpp
diff --git a/pcbnew/export_d356.cpp b/pcbnew/exporters/export_d356.cpp
similarity index 100%
rename from pcbnew/export_d356.cpp
rename to pcbnew/exporters/export_d356.cpp
diff --git a/pcbnew/export_gencad.cpp b/pcbnew/exporters/export_gencad.cpp
similarity index 100%
rename from pcbnew/export_gencad.cpp
rename to pcbnew/exporters/export_gencad.cpp
diff --git a/pcbnew/export_idf.cpp b/pcbnew/exporters/export_idf.cpp
similarity index 100%
rename from pcbnew/export_idf.cpp
rename to pcbnew/exporters/export_idf.cpp
diff --git a/pcbnew/export_vrml.cpp b/pcbnew/exporters/export_vrml.cpp
similarity index 100%
rename from pcbnew/export_vrml.cpp
rename to pcbnew/exporters/export_vrml.cpp
diff --git a/pcbnew/gen_drill_report_files.cpp b/pcbnew/exporters/gen_drill_report_files.cpp
similarity index 100%
rename from pcbnew/gen_drill_report_files.cpp
rename to pcbnew/exporters/gen_drill_report_files.cpp
diff --git a/pcbnew/gen_modules_placefile.cpp b/pcbnew/exporters/gen_modules_placefile.cpp
similarity index 100%
rename from pcbnew/gen_modules_placefile.cpp
rename to pcbnew/exporters/gen_modules_placefile.cpp
diff --git a/pcbnew/gendrill_Excellon_writer.cpp b/pcbnew/exporters/gendrill_Excellon_writer.cpp
similarity index 100%
rename from pcbnew/gendrill_Excellon_writer.cpp
rename to pcbnew/exporters/gendrill_Excellon_writer.cpp
diff --git a/pcbnew/gendrill_Excellon_writer.h b/pcbnew/exporters/gendrill_Excellon_writer.h
similarity index 100%
rename from pcbnew/gendrill_Excellon_writer.h
rename to pcbnew/exporters/gendrill_Excellon_writer.h
diff --git a/pcbnew/idf.cpp b/pcbnew/exporters/idf.cpp
similarity index 100%
rename from pcbnew/idf.cpp
rename to pcbnew/exporters/idf.cpp
diff --git a/pcbnew/idf.h b/pcbnew/exporters/idf.h
similarity index 100%
rename from pcbnew/idf.h
rename to pcbnew/exporters/idf.h
diff --git a/pcbnew/vrml_board.cpp b/pcbnew/exporters/vrml_board.cpp
similarity index 100%
rename from pcbnew/vrml_board.cpp
rename to pcbnew/exporters/vrml_board.cpp
diff --git a/pcbnew/vrml_board.h b/pcbnew/exporters/vrml_board.h
similarity index 100%
rename from pcbnew/vrml_board.h
rename to pcbnew/exporters/vrml_board.h