diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index f9c7b25217..c0fbac65ba 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -281,6 +281,10 @@ set( PLUGINS_CADSTAR_SRCS
     plugins/cadstar/cadstar_archive_parser.cpp
     )
 
+set( PLUGINS_EAGLE_SRCS
+    plugins/eagle/eagle_parser.cpp
+    )
+
 set( COMMON_SRCS
     ${LIB_KICAD_SRCS}
     ${COMMON_ABOUT_DLG_SRCS}
@@ -291,6 +295,7 @@ set( COMMON_SRCS
     ${PLOTTERS_CONTROL_SRCS}
     ${PLUGINS_ALTIUM_SRCS}
     ${PLUGINS_CADSTAR_SRCS}
+    ${PLUGINS_EAGLE_SRCS}
     advanced_config.cpp
     array_axis.cpp
     array_options.cpp
@@ -309,7 +314,6 @@ set( COMMON_SRCS
     dialog_shim.cpp
     gr_text.cpp
     dsnlexer.cpp
-    eagle_parser.cpp
     eda_base_frame.cpp
     eda_dde.cpp
     eda_doc.cpp
@@ -517,7 +521,7 @@ set( PCB_COMMON_SRCS
     ${CMAKE_SOURCE_DIR}/pcbnew/drc/drc_rule.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/drc/drc_rule_condition.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/drc/drc_rule_parser.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/eagle_plugin.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/plugins/eagle/eagle_plugin.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/footprint_editor_settings.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/gpcb_plugin.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/io_mgr.cpp
diff --git a/common/eagle_parser.cpp b/common/plugins/eagle/eagle_parser.cpp
similarity index 99%
rename from common/eagle_parser.cpp
rename to common/plugins/eagle/eagle_parser.cpp
index 45064c6430..b5cf62add4 100644
--- a/common/eagle_parser.cpp
+++ b/common/plugins/eagle/eagle_parser.cpp
@@ -24,7 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <eagle_parser.h>
+#include <plugins/eagle/eagle_parser.h>
 
 #include <functional>
 #include <sstream>
diff --git a/include/eagle_parser.h b/common/plugins/eagle/eagle_parser.h
similarity index 100%
rename from include/eagle_parser.h
rename to common/plugins/eagle/eagle_parser.h
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index bbc0749325..152931964e 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -207,7 +207,7 @@ set( EESCHEMA_SRCS
     ee_collectors.cpp
     sch_component.cpp
     sch_connection.cpp
-    sch_eagle_plugin.cpp
+    sch_plugins/eagle/sch_eagle_plugin.cpp
     sch_field.cpp
     sch_io_mgr.cpp
     sch_item.cpp
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index d7166429a1..54278e1cf9 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -42,7 +42,6 @@
 #include <reporter.h>
 #include <richio.h>
 #include <sch_component.h>
-#include <sch_eagle_plugin.h>
 #include <sch_edit_frame.h>
 #include <sch_legacy_plugin.h>
 #include <sch_sheet.h>
diff --git a/eeschema/sch_io_mgr.cpp b/eeschema/sch_io_mgr.cpp
index 6b7631998c..095819e43d 100644
--- a/eeschema/sch_io_mgr.cpp
+++ b/eeschema/sch_io_mgr.cpp
@@ -25,7 +25,7 @@
 
 #include <sch_io_mgr.h>
 #include <sch_legacy_plugin.h>
-#include <sch_eagle_plugin.h>
+#include <sch_plugins/eagle/sch_eagle_plugin.h>
 #include <sch_sexpr_plugin.h>
 
 #include <sch_plugins/altium/sch_altium_plugin.h>
diff --git a/eeschema/sch_eagle_plugin.cpp b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
similarity index 99%
rename from eeschema/sch_eagle_plugin.cpp
rename to eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
index 1398af3848..9e57ad7bf6 100644
--- a/eeschema/sch_eagle_plugin.cpp
+++ b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
@@ -22,7 +22,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sch_eagle_plugin.h>
+#include <sch_plugins/eagle/sch_eagle_plugin.h>
 
 #include <kiway.h>
 #include <properties.h>
@@ -34,7 +34,7 @@
 
 #include <class_libentry.h>
 #include <class_library.h>
-#include <eagle_parser.h>
+#include <plugins/eagle/eagle_parser.h>
 #include <gr_text.h>
 #include <lib_arc.h>
 #include <lib_circle.h>
diff --git a/eeschema/sch_eagle_plugin.h b/eeschema/sch_plugins/eagle/sch_eagle_plugin.h
similarity index 99%
rename from eeschema/sch_eagle_plugin.h
rename to eeschema/sch_plugins/eagle/sch_eagle_plugin.h
index 1f1be2ef1d..55fa4025df 100644
--- a/eeschema/sch_eagle_plugin.h
+++ b/eeschema/sch_plugins/eagle/sch_eagle_plugin.h
@@ -27,7 +27,7 @@
 
 #include <sch_line.h>
 #include <sch_io_mgr.h>
-#include <eagle_parser.h>
+#include <plugins/eagle/eagle_parser.h>
 #include <lib_item.h>
 #include <geometry/seg.h>
 
diff --git a/pcbnew/io_mgr.cpp b/pcbnew/io_mgr.cpp
index 0143dbda20..ad56428738 100644
--- a/pcbnew/io_mgr.cpp
+++ b/pcbnew/io_mgr.cpp
@@ -26,7 +26,7 @@
 #include <wx/uri.h>
 
 #include <config.h>
-#include <eagle_plugin.h>
+#include <plugins/eagle/eagle_plugin.h>
 #include <gpcb_plugin.h>
 #include <io_mgr.h>
 #include <kicad_plugin.h>
diff --git a/pcbnew/eagle_plugin.cpp b/pcbnew/plugins/eagle/eagle_plugin.cpp
similarity index 99%
rename from pcbnew/eagle_plugin.cpp
rename to pcbnew/plugins/eagle/eagle_plugin.cpp
index 562e405e5f..fd17f7d4a8 100644
--- a/pcbnew/eagle_plugin.cpp
+++ b/pcbnew/plugins/eagle/eagle_plugin.cpp
@@ -71,7 +71,7 @@ Load() TODO's
 #include <pcb_text.h>
 #include <class_dimension.h>
 
-#include <eagle_plugin.h>
+#include <plugins/eagle/eagle_plugin.h>
 
 using namespace std;
 
diff --git a/pcbnew/eagle_plugin.h b/pcbnew/plugins/eagle/eagle_plugin.h
similarity index 99%
rename from pcbnew/eagle_plugin.h
rename to pcbnew/plugins/eagle/eagle_plugin.h
index 5280b3b7cd..bf1847364a 100644
--- a/pcbnew/eagle_plugin.h
+++ b/pcbnew/plugins/eagle/eagle_plugin.h
@@ -27,7 +27,7 @@
 
 #include <io_mgr.h>
 #include <layers_id_colors_and_visibility.h>
-#include <eagle_parser.h>
+#include <plugins/eagle/eagle_parser.h>
 
 #include <map>
 #include <wx/xml/xml.h>