diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 84cef320ee..f053ee5b6b 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -28,20 +28,20 @@ set( GAL_SRCS
     # Common part
     basic_gal.cpp
     draw_panel_gal.cpp
-    painter.cpp
-    newstroke_font.cpp
-    worksheet_viewitem.cpp
-    origin_viewitem.cpp
     gl_context_mgr.cpp
+    newstroke_font.cpp
+    origin_viewitem.cpp
+    painter.cpp
     text_utils.cpp
+    worksheet_viewitem.cpp
+    gal/color4d.cpp
     gal/gal_display_options.cpp
     gal/graphics_abstraction_layer.cpp
+    gal/hidpi_gl_canvas.cpp
     gal/stroke_font.cpp
-    gal/color4d.cpp
+    geometry/hetriang.cpp
     view/view_controls.cpp
     view/wx_view_controls.cpp
-    geometry/hetriang.cpp
-    gal/hidpi_gl_canvas.cpp
 
     # OpenGL GAL
     gal/opengl/opengl_gal.cpp
@@ -152,36 +152,36 @@ set( COMMON_ABOUT_DLG_SRCS
 
 set( COMMON_DLG_SRCS
     dialogs/dialog_display_info_HTML_base.cpp
+    dialogs/dialog_env_var_config.cpp
+    dialogs/dialog_env_var_config_base.cpp
     dialogs/dialog_exit_base.cpp
-    dialogs/dialog_image_editor.cpp
-    dialogs/dialog_image_editor_base.cpp
     dialogs/dialog_get_component.cpp
     dialogs/dialog_get_component_base.cpp
     dialogs/dialog_hotkeys_editor.cpp
     dialogs/dialog_hotkeys_editor_base.cpp
+    dialogs/dialog_image_editor.cpp
+    dialogs/dialog_image_editor_base.cpp
     dialogs/dialog_list_selector_base.cpp
     dialogs/dialog_page_settings_base.cpp
-    dialogs/dialog_env_var_config_base.cpp
-    dialogs/dialog_env_var_config.cpp
-    dialogs/wx_html_report_panel_base.cpp
     dialogs/wx_html_report_panel.cpp
+    dialogs/wx_html_report_panel_base.cpp
     )
 
 set( COMMON_WIDGET_SRCS
-    widgets/color_swatch.cpp
-    widgets/color4Dpickerdlg_base.cpp
     widgets/color4Dpickerdlg.cpp
-    widgets/gal_options_panel.cpp
-    widgets/mathplot.cpp
-    widgets/widget_hotkey_list.cpp
-    widgets/two_column_tree_list.cpp
+    widgets/color4Dpickerdlg_base.cpp
+    widgets/color_swatch.cpp
+    widgets/footprint_choice.cpp
     widgets/footprint_preview_widget.cpp
     widgets/footprint_select_widget.cpp
-    widgets/footprint_choice.cpp
+    widgets/gal_options_panel.cpp
     widgets/indicator_icon.cpp
-    widgets/text_ctrl_eval.cpp
-    widgets/unit_binder.cpp
+    widgets/mathplot.cpp
     widgets/progress_reporter.cpp
+    widgets/text_ctrl_eval.cpp
+    widgets/two_column_tree_list.cpp
+    widgets/unit_binder.cpp
+    widgets/widget_hotkey_list.cpp
     )
 
 set( COMMON_PAGE_LAYOUT_SRCS
@@ -197,14 +197,14 @@ set( COMMON_PAGE_LAYOUT_SRCS
 set( COMMON_PREVIEW_ITEMS_SRCS
     preview_items/arc_assistant.cpp
     preview_items/arc_geom_manager.cpp
-    preview_items/centreline_rect_item.cpp
-    preview_items/preview_utils.cpp
-    preview_items/ruler_item.cpp
-    preview_items/simple_overlay_item.cpp
-    preview_items/selection_area.cpp
     preview_items/bright_box.cpp
+    preview_items/centreline_rect_item.cpp
     preview_items/polygon_geom_manager.cpp
     preview_items/polygon_item.cpp
+    preview_items/preview_utils.cpp
+    preview_items/ruler_item.cpp
+    preview_items/selection_area.cpp
+    preview_items/simple_overlay_item.cpp
     )
 
 set( COMMON_SRCS
@@ -230,17 +230,17 @@ set( COMMON_SRCS
     colors.cpp
     commit.cpp
     common.cpp
-    common_plot_functions.cpp
-    common_plotHPGL_functions.cpp
-    common_plotPS_functions.cpp
-    common_plotPDF_functions.cpp
-    common_plotGERBER_functions.cpp
     common_plotDXF_functions.cpp
+    common_plotGERBER_functions.cpp
+    common_plotHPGL_functions.cpp
+    common_plotPDF_functions.cpp
+    common_plotPS_functions.cpp
     common_plotSVG_functions.cpp
+    common_plot_functions.cpp
     config_params.cpp
     confirm.cpp
-    copy_to_clipboard.cpp
     convert_basic_shapes_to_polygon.cpp
+    copy_to_clipboard.cpp
     dialog_shim.cpp
     displlst.cpp
     draw_frame.cpp
@@ -255,17 +255,15 @@ set( COMMON_SRCS
     exceptions.cpp
     executable_names.cpp
     filter_reader.cpp
-    footprint_info.cpp
-    footprint_filter.cpp
-    hash_eda.cpp
-    lib_id.cpp
-    lib_table_keywords.cpp
 #    findkicadhelppath.cpp.notused      deprecated, use searchhelpfilefullpath.cpp
+    footprint_filter.cpp
+    footprint_info.cpp
     gbr_metadata.cpp
     gestfich.cpp
     getrunningmicrosecs.cpp
-    grid_tricks.cpp
     gr_basic.cpp
+    grid_tricks.cpp
+    hash_eda.cpp
     hotkeys_basic.cpp
     html_messagebox.cpp
     incremental_text_ctrl.cpp
@@ -274,7 +272,9 @@ set( COMMON_SRCS
     kiway_express.cpp
     kiway_holder.cpp
     kiway_player.cpp
+    lib_id.cpp
     lib_table_base.cpp
+    lib_table_keywords.cpp
     lockfile.cpp
     md5_hash.cpp
     msgpanel.cpp
@@ -286,8 +286,8 @@ set( COMMON_SRCS
     ptree.cpp
     reporter.cpp
     richio.cpp
-    searchhelpfilefullpath.cpp
     search_stack.cpp
+    searchhelpfilefullpath.cpp
     selcolor.cpp
     settings.cpp
     systemdirsappend.cpp
@@ -296,9 +296,9 @@ set( COMMON_SRCS
     validators.cpp
     wildcards_and_files_ext.cpp
     worksheet.cpp
-    wxwineda.cpp
-    wxdataviewctrl_helpers.cpp
     wx_status_popup.cpp
+    wxdataviewctrl_helpers.cpp
+    wxwineda.cpp
     xnode.cpp
     zoom.cpp
     )
@@ -328,30 +328,30 @@ set( COMMON_SRCS
 
     math/math_util.cpp
 
+    tool/action_manager.cpp
+    tool/actions.cpp
+    tool/common_tools.cpp
+    tool/conditional_menu.cpp
+    tool/context_menu.cpp
+    tool/grid_menu.cpp
+    tool/selection_conditions.cpp
     tool/tool_action.cpp
     tool/tool_base.cpp
-    tool/tool_manager.cpp
     tool/tool_dispatcher.cpp
     tool/tool_event.cpp
     tool/tool_interactive.cpp
-    tool/action_manager.cpp
-    tool/context_menu.cpp
-    tool/actions.cpp
-    tool/common_tools.cpp
-    tool/grid_menu.cpp
-    tool/zoom_menu.cpp
+    tool/tool_manager.cpp
     tool/tool_menu.cpp
-    tool/conditional_menu.cpp
-    tool/selection_conditions.cpp
+    tool/zoom_menu.cpp
     tool/zoom_tool.cpp
 
+    geometry/convex_hull.cpp
     geometry/seg.cpp
     geometry/shape.cpp
-    geometry/shape_line_chain.cpp
-    geometry/shape_poly_set.cpp
     geometry/shape_collisions.cpp
     geometry/shape_file_io.cpp
-    geometry/convex_hull.cpp
+    geometry/shape_line_chain.cpp
+    geometry/shape_poly_set.cpp
 
     libeval/numeric_evaluator.cpp
     )
@@ -367,12 +367,15 @@ target_link_libraries( common
 
 set( PCB_COMMON_SRCS
     base_screen.cpp
-    eda_text.cpp
     class_page_info.cpp
+    eda_text.cpp
+    fp_lib_table.cpp
     lset.cpp
+    pcb_keywords.cpp
+    pcb_plot_params_keywords.cpp
     ../pcbnew/basepcbframe.cpp
-    ../pcbnew/board_items_to_polygon_shape_transform.cpp
     ../pcbnew/board_commit.cpp
+    ../pcbnew/board_items_to_polygon_shape_transform.cpp
     ../pcbnew/class_board.cpp
     ../pcbnew/class_board_connected_item.cpp
     ../pcbnew/class_board_design_settings.cpp
@@ -381,50 +384,47 @@ set( PCB_COMMON_SRCS
     ../pcbnew/class_drawsegment.cpp
     ../pcbnew/class_drc_item.cpp
     ../pcbnew/class_edge_mod.cpp
+    ../pcbnew/class_marker_pcb.cpp
+    ../pcbnew/class_module.cpp
     ../pcbnew/class_netclass.cpp
     ../pcbnew/class_netinfo_item.cpp
     ../pcbnew/class_netinfolist.cpp
-    ../pcbnew/class_marker_pcb.cpp
-    ../pcbnew/class_pcb_target.cpp
-    ../pcbnew/class_module.cpp
     ../pcbnew/class_pad.cpp
     ../pcbnew/class_pad_custom_shape_functions.cpp
     ../pcbnew/class_pad_draw_functions.cpp
+    ../pcbnew/class_pcb_target.cpp
     ../pcbnew/class_pcb_text.cpp
     ../pcbnew/class_text_mod.cpp
     ../pcbnew/class_track.cpp
     ../pcbnew/class_zone.cpp
     ../pcbnew/class_zone_settings.cpp
     ../pcbnew/classpcb.cpp
-    ../pcbnew/connectivity_data.cpp
-    ../pcbnew/connectivity_algo.cpp
-    ../pcbnew/convert_drawsegment_list_to_polygon.cpp
-    ../pcbnew/ratsnest_data.cpp
-    ../pcbnew/ratsnest_viewitem.cpp
-    ../pcbnew/pcb_general_settings.cpp
     ../pcbnew/collectors.cpp
-    ../pcbnew/netlist_reader.cpp
-    ../pcbnew/legacy_netlist_reader.cpp
-    ../pcbnew/kicad_netlist_reader.cpp
-    ../pcbnew/sel_layer.cpp
-    ../pcbnew/pcb_plot_params.cpp
-    ../pcbnew/io_mgr.cpp
-    ../pcbnew/plugin.cpp
+    ../pcbnew/connectivity_algo.cpp
+    ../pcbnew/connectivity_data.cpp
+    ../pcbnew/convert_drawsegment_list_to_polygon.cpp
     ../pcbnew/eagle_plugin.cpp
-    ../pcbnew/legacy_plugin.cpp
-    ../pcbnew/kicad_plugin.cpp
-    ../pcbnew/kicad_clipboard.cpp
     ../pcbnew/gpcb_plugin.cpp
-    ../pcbnew/pcb_netlist.cpp
+    ../pcbnew/io_mgr.cpp
+    ../pcbnew/kicad_clipboard.cpp
+    ../pcbnew/kicad_netlist_reader.cpp
+    ../pcbnew/kicad_plugin.cpp
+    ../pcbnew/legacy_netlist_reader.cpp
+    ../pcbnew/legacy_plugin.cpp
+    ../pcbnew/netlist_reader.cpp
     ../pcbnew/pcb_display_options.cpp
     ../pcbnew/pcb_draw_panel_gal.cpp
-    ../pcbnew/pcb_view.cpp
+    ../pcbnew/pcb_general_settings.cpp
+    ../pcbnew/pcb_netlist.cpp
     ../pcbnew/pcb_painter.cpp
-    widgets/widget_net_selector.cpp
-    pcb_plot_params_keywords.cpp
-    pcb_keywords.cpp
     ../pcbnew/pcb_parser.cpp
-    fp_lib_table.cpp
+    ../pcbnew/pcb_plot_params.cpp
+    ../pcbnew/pcb_view.cpp
+    ../pcbnew/plugin.cpp
+    ../pcbnew/ratsnest_data.cpp
+    ../pcbnew/ratsnest_viewitem.cpp
+    ../pcbnew/sel_layer.cpp
+    widgets/widget_net_selector.cpp
 )
 
 set( PCB_COMMON_SRCS
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index a2e5924d3e..84f277453f 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -25,16 +25,16 @@ set( EESCHEMA_DLGS
     dialogs/dialog_annotate_base.cpp
     dialogs/dialog_bom.cpp
     dialogs/dialog_bom_base.cpp
+    dialogs/dialog_bom_cfg_keywords.cpp
     dialogs/dialog_bom_editor.cpp
     dialogs/dialog_bom_editor_base.cpp
-    dialogs/dialog_bom_cfg_keywords.cpp
     dialogs/dialog_choose_component.cpp
-    dialogs/dialog_lib_edit_text.cpp
-    dialogs/dialog_lib_edit_text_base.cpp
     dialogs/dialog_edit_component_in_lib.cpp
     dialogs/dialog_edit_component_in_lib_base.cpp
-    dialogs/dialog_edit_component_in_schematic_fbp.cpp
     dialogs/dialog_edit_component_in_schematic.cpp
+    dialogs/dialog_edit_component_in_schematic_fbp.cpp
+    dialogs/dialog_edit_components_libid.cpp
+    dialogs/dialog_edit_components_libid_base.cpp
     dialogs/dialog_edit_label.cpp
     dialogs/dialog_edit_label_base.cpp
     dialogs/dialog_edit_libentry_fields_in_lib.cpp
@@ -42,30 +42,30 @@ set( EESCHEMA_DLGS
     dialogs/dialog_edit_line_style.cpp
     dialogs/dialog_edit_line_style_base.cpp
     dialogs/dialog_edit_one_field.cpp
-    dialogs/dialog_edit_components_libid.cpp
-    dialogs/dialog_edit_components_libid_base.cpp
-    dialogs/dialog_eeschema_options_base.cpp
     dialogs/dialog_eeschema_options.cpp
+    dialogs/dialog_eeschema_options_base.cpp
     dialogs/dialog_erc.cpp
     dialogs/dialog_erc_base.cpp
     dialogs/dialog_global_sym_lib_table_config.cpp
     dialogs/dialog_global_sym_lib_table_config_base.cpp
     dialogs/dialog_lib_edit_draw_item.cpp
     dialogs/dialog_lib_edit_draw_item_base.cpp
-    dialogs/dialog_libedit_options_base.cpp
-    dialogs/dialog_libedit_options.cpp
     dialogs/dialog_lib_edit_pin.cpp
     dialogs/dialog_lib_edit_pin_base.cpp
     dialogs/dialog_lib_edit_pin_table.cpp
     dialogs/dialog_lib_edit_pin_table_base.cpp
+    dialogs/dialog_lib_edit_text.cpp
+    dialogs/dialog_lib_edit_text_base.cpp
     dialogs/dialog_lib_new_component.cpp
     dialogs/dialog_lib_new_component_base.cpp
+    dialogs/dialog_libedit_options.cpp
+    dialogs/dialog_libedit_options_base.cpp
     dialogs/dialog_netlist.cpp
     dialogs/dialog_netlist_base.cpp
-    dialogs/dialog_plot_schematic_base.cpp
     dialogs/dialog_plot_schematic.cpp
-    dialogs/dialog_print_using_printer_base.cpp
+    dialogs/dialog_plot_schematic_base.cpp
     dialogs/dialog_print_using_printer.cpp
+    dialogs/dialog_print_using_printer_base.cpp
     dialogs/dialog_rescue_each.cpp
     dialogs/dialog_rescue_each_base.cpp
     dialogs/dialog_sch_edit_sheet_pin.cpp
@@ -85,35 +85,38 @@ set( EESCHEMA_DLGS
 set( EESCHEMA_WIDGETS
     widgets/cmp_tree_pane.cpp
     widgets/component_tree.cpp
-    widgets/widget_eeschema_color_config.cpp
     widgets/pin_shape_combobox.cpp
     widgets/pin_type_combobox.cpp
+    widgets/widget_eeschema_color_config.cpp
     )
 
 
 set( EESCHEMA_SRCS
-    autoplace_fields.cpp
+    ${EESCHEMA_DLGS}
+    ${EESCHEMA_WIDGETS}
     annotate.cpp
+    autoplace_fields.cpp
     backanno.cpp
     block.cpp
     block_libedit.cpp
-    bom_table_model.cpp
     bom_table_column.cpp
-    busentry.cpp
+    bom_table_model.cpp
     bus-wire-junction.cpp
+    busentry.cpp
     class_drc_erc_item.cpp
     class_libentry.cpp
     class_library.cpp
     class_netlist_object.cpp
     cmp_library_keywords.cpp
     cmp_library_lexer.cpp
+    cmp_tree_model.cpp
+    cmp_tree_model_adapter.cpp
+    cmp_tree_model_adapter_base.cpp
     component_references_lister.cpp
     controle.cpp
     cross-probing.cpp
-    ${EESCHEMA_DLGS}
-    ${EESCHEMA_WIDGETS}
-    edit_component_in_schematic.cpp
     edit_bitmap.cpp
+    edit_component_in_schematic.cpp
     edit_label.cpp
     eeredraw.cpp
     eeschema.cpp
@@ -122,21 +125,11 @@ set( EESCHEMA_SRCS
     events_called_functions_for_edit.cpp
     files-io.cpp
     find.cpp
-    getpart.cpp
-    cmp_tree_model.cpp
-    cmp_tree_model_adapter.cpp
-    cmp_tree_model_adapter_base.cpp
     generate_alias_info.cpp
+    getpart.cpp
     hierarch.cpp
     highlight_connection.cpp
     hotkeys.cpp
-    libarch.cpp
-    libedit.cpp
-    libeditframe.cpp
-    libedit_onleftclick.cpp
-    libedit_onrightclick.cpp
-    libedit_plot_component.cpp
-    libedit_undo_redo.cpp
     lib_arc.cpp
     lib_bezier.cpp
     lib_circle.cpp
@@ -150,6 +143,13 @@ set( EESCHEMA_SRCS
     lib_polyline.cpp
     lib_rectangle.cpp
     lib_text.cpp
+    libarch.cpp
+    libedit.cpp
+    libedit_onleftclick.cpp
+    libedit_onrightclick.cpp
+    libedit_plot_component.cpp
+    libedit_undo_redo.cpp
+    libeditframe.cpp
     libfield.cpp
     menubar.cpp
     menubar_libedit.cpp
@@ -158,14 +158,14 @@ set( EESCHEMA_SRCS
     onleftclick.cpp
     onrightclick.cpp
     operations_on_items_lists.cpp
-    pinedit.cpp
     pin_number.cpp
     pin_shape.cpp
     pin_type.cpp
+    pinedit.cpp
     plot_schematic_DXF.cpp
     plot_schematic_HPGL.cpp
-    plot_schematic_PS.cpp
     plot_schematic_PDF.cpp
+    plot_schematic_PS.cpp
     plot_schematic_SVG.cpp
     project_rescue.cpp
     sch_base_frame.cpp
@@ -198,8 +198,8 @@ set( EESCHEMA_SRCS
     symbdraw.cpp
     symbedit.cpp
     symbol_lib_table.cpp
-    template_fieldnames_keywords.cpp
     template_fieldnames.cpp
+    template_fieldnames_keywords.cpp
     tool_lib.cpp
     tool_sch.cpp
     tool_viewlib.cpp
@@ -219,23 +219,23 @@ set( EESCHEMA_SRCS
 set( EESCHEMA_COMMON_SRCS
     ../common/dialogs/dialog_page_settings.cpp
     ../common/base_screen.cpp
-    ../common/eda_text.cpp
-    ../common/class_page_info.cpp
     ../common/base_units.cpp
+    ../common/class_page_info.cpp
+    ../common/eda_text.cpp
     )
 
 
 if( KICAD_SPICE )
     set( EESCHEMA_SRCS
         ${EESCHEMA_SRCS}
-        sim/simulate.cpp
-        sim/sim_plot_frame_base.cpp
+        sim/netlist_exporter_pspice_sim.cpp
+        sim/ngspice.cpp
         sim/sim_plot_frame.cpp
+        sim/sim_plot_frame_base.cpp
         sim/sim_plot_panel.cpp
+        sim/simulate.cpp
         sim/spice_simulator.cpp
         sim/spice_value.cpp
-        sim/ngspice.cpp
-        sim/netlist_exporter_pspice_sim.cpp
         dialogs/dialog_signal_list.cpp
         dialogs/dialog_signal_list_base.cpp
         dialogs/dialog_sim_settings.cpp
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 0348731b47..b01693e42c 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -50,10 +50,12 @@ include_directories(
     )
 
 set( PCBNEW_DIALOGS
-    dialogs/dialog_block_options_base.cpp
+    dialogs/dialog_SVG_print.cpp
+    dialogs/dialog_SVG_print_base.cpp
     dialogs/dialog_block_options.cpp
-    dialogs/dialog_cleaning_options_base.cpp
+    dialogs/dialog_block_options_base.cpp
     dialogs/dialog_cleaning_options.cpp
+    dialogs/dialog_cleaning_options_base.cpp
     dialogs/dialog_copper_zones.cpp
     dialogs/dialog_copper_zones_base.cpp
     dialogs/dialog_create_array.cpp
@@ -63,92 +65,92 @@ set( PCBNEW_DIALOGS
     dialogs/dialog_dimension_editor_base.cpp
     dialogs/dialog_display_options.cpp
     dialogs/dialog_display_options_base.cpp
-    dialogs/dialog_drc_base.cpp
     dialogs/dialog_drc.cpp
+    dialogs/dialog_drc_base.cpp
     dialogs/dialog_edit_module_for_BoardEditor.cpp
     dialogs/dialog_edit_module_for_BoardEditor_base.cpp
-    dialogs/dialog_edit_module_for_Modedit_base.cpp
     dialogs/dialog_edit_module_for_Modedit.cpp
+    dialogs/dialog_edit_module_for_Modedit_base.cpp
     dialogs/dialog_edit_module_text.cpp
     dialogs/dialog_edit_module_text_base.cpp
     dialogs/dialog_enum_pads.cpp
     dialogs/dialog_enum_pads_base.cpp
-    dialogs/dialog_exchange_modules_base.cpp
     dialogs/dialog_exchange_modules.cpp
+    dialogs/dialog_exchange_modules_base.cpp
     dialogs/dialog_export_idf.cpp
     dialogs/dialog_export_idf_base.cpp
-    dialogs/dialog_export_vrml_base.cpp
-    dialogs/dialog_export_vrml.cpp
-    dialogs/dialog_export_step_base.cpp
     dialogs/dialog_export_step.cpp
-    dialogs/dialog_find_base.cpp
+    dialogs/dialog_export_step_base.cpp
+    dialogs/dialog_export_vrml.cpp
+    dialogs/dialog_export_vrml_base.cpp
     dialogs/dialog_find.cpp
-    dialogs/dialog_fp_lib_table_base.cpp
+    dialogs/dialog_find_base.cpp
+    dialogs/dialog_footprint_wizard_list.cpp
+    dialogs/dialog_footprint_wizard_list_base.cpp
     dialogs/dialog_fp_lib_table.cpp
-    dialogs/dialog_fp_plugin_options_base.cpp
+    dialogs/dialog_fp_lib_table_base.cpp
     dialogs/dialog_fp_plugin_options.cpp
+    dialogs/dialog_fp_plugin_options_base.cpp
     dialogs/dialog_freeroute_exchange.cpp
     dialogs/dialog_freeroute_exchange_base.cpp
+    dialogs/dialog_gen_module_position_file_base.cpp
     dialogs/dialog_gencad_export_options.cpp
     dialogs/dialog_gendrill.cpp
     dialogs/dialog_gendrill_base.cpp
-    dialogs/dialog_gen_module_position_file_base.cpp
     dialogs/dialog_general_options.cpp
     dialogs/dialog_general_options_BoardEditor_base.cpp
     dialogs/dialog_get_footprint_by_name_base.cpp
+    dialogs/dialog_global_deletion.cpp
+    dialogs/dialog_global_deletion_base.cpp
     dialogs/dialog_global_edit_tracks_and_vias.cpp
     dialogs/dialog_global_edit_tracks_and_vias_base.cpp
     dialogs/dialog_global_modules_fields_edition.cpp
     dialogs/dialog_global_modules_fields_edition_base.cpp
-    dialogs/dialog_global_pads_edition_base.cpp
     dialogs/dialog_global_pads_edition.cpp
-    dialogs/dialog_graphic_items_options.cpp
-    dialogs/dialog_graphic_items_options_base.cpp
+    dialogs/dialog_global_pads_edition_base.cpp
     dialogs/dialog_graphic_item_properties.cpp
     dialogs/dialog_graphic_item_properties_base.cpp
     dialogs/dialog_graphic_item_properties_for_Modedit.cpp
-    dialogs/dialog_global_deletion.cpp
-    dialogs/dialog_global_deletion_base.cpp
+    dialogs/dialog_graphic_items_options.cpp
+    dialogs/dialog_graphic_items_options_base.cpp
     dialogs/dialog_keepout_area_properties.cpp
     dialogs/dialog_keepout_area_properties_base.cpp
     dialogs/dialog_layer_selection_base.cpp
     dialogs/dialog_layers_setup.cpp
     dialogs/dialog_layers_setup_base.cpp
+    dialogs/dialog_mask_clearance.cpp
+    dialogs/dialog_mask_clearance_base.cpp
     dialogs/dialog_modedit_display_options.cpp
     dialogs/dialog_modedit_options.cpp
     dialogs/dialog_modedit_options_base.cpp
-    dialogs/dialog_netlist.cpp
-    dialogs/dialog_netlist_fbp.cpp
-    dialogs/dialog_pcb_text_properties.cpp
-    dialogs/dialog_pcb_text_properties_base.cpp
-    dialogs/dialog_pns_settings.cpp
-    dialogs/dialog_pns_settings_base.cpp
     dialogs/dialog_move_exact.cpp
     dialogs/dialog_move_exact_base.cpp
+    dialogs/dialog_netlist.cpp
+    dialogs/dialog_netlist_fbp.cpp
+    dialogs/dialog_non_copper_zones_properties.cpp
+    dialogs/dialog_non_copper_zones_properties_base.cpp
+    dialogs/dialog_pad_basicshapes_properties.cpp
+    dialogs/dialog_pad_properties.cpp
+    dialogs/dialog_pad_properties_base.cpp
+    dialogs/dialog_pcb_text_properties.cpp
+    dialogs/dialog_pcb_text_properties_base.cpp
+    dialogs/dialog_plot.cpp
+    dialogs/dialog_plot_base.cpp
     dialogs/dialog_pns_diff_pair_dimensions.cpp
     dialogs/dialog_pns_diff_pair_dimensions_base.cpp
     dialogs/dialog_pns_length_tuning_settings.cpp
     dialogs/dialog_pns_length_tuning_settings_base.cpp
-    dialogs/dialog_non_copper_zones_properties.cpp
-    dialogs/dialog_non_copper_zones_properties_base.cpp
-    dialogs/dialog_pad_properties.cpp
-    dialogs/dialog_pad_properties_base.cpp
-    dialogs/dialog_pad_basicshapes_properties.cpp
-    dialogs/dialog_plot_base.cpp
-    dialogs/dialog_plot.cpp
+    dialogs/dialog_pns_settings.cpp
+    dialogs/dialog_pns_settings_base.cpp
     dialogs/dialog_position_relative.cpp
     dialogs/dialog_position_relative_base.cpp
     dialogs/dialog_print_for_modedit.cpp
     dialogs/dialog_print_for_modedit_base.cpp
     dialogs/dialog_print_using_printer.cpp
     dialogs/dialog_print_using_printer_base.cpp
-    dialogs/dialog_mask_clearance.cpp
-    dialogs/dialog_mask_clearance_base.cpp
-    dialogs/dialog_SVG_print.cpp
-    dialogs/dialog_SVG_print_base.cpp
-    dialogs/dialog_select_pretty_lib.cpp
-    dialogs/dialog_select_net_from_list_base.cpp
     dialogs/dialog_select_net_from_list.cpp
+    dialogs/dialog_select_net_from_list_base.cpp
+    dialogs/dialog_select_pretty_lib.cpp
     dialogs/dialog_select_pretty_lib_base.cpp
     dialogs/dialog_set_grid.cpp
     dialogs/dialog_set_grid_base.cpp
@@ -157,20 +159,18 @@ set( PCBNEW_DIALOGS
     dialogs/dialog_track_via_properties_base.cpp
     dialogs/dialog_track_via_size.cpp
     dialogs/dialog_track_via_size_base.cpp
-    dialogs/dialog_update_pcb_base.cpp
     dialogs/dialog_update_pcb.cpp
+    dialogs/dialog_update_pcb_base.cpp
+    dialogs/wizard_add_fplib.cpp
+    dialogs/wizard_add_fplib_base.cpp
     footprint_wizard.cpp
     footprint_wizard_frame.cpp
-    dialogs/dialog_footprint_wizard_list_base.cpp
-    dialogs/dialog_footprint_wizard_list.cpp
-    dialogs/wizard_add_fplib_base.cpp
-    dialogs/wizard_add_fplib.cpp
     ${GITHUB_3DLIBRARIES_WIZARD}
     )
 
 set( PCBNEW_IMPORT_DXF
-    import_dxf/dialog_dxf_import_base.cpp
     import_dxf/dialog_dxf_import.cpp
+    import_dxf/dialog_dxf_import_base.cpp
     import_dxf/dxf2brd_items.cpp
     )
 
@@ -192,42 +192,42 @@ set( PCBNEW_MICROWAVE_SRCS
     )
 
 set( PCBNEW_CLASS_SRCS
+    ${PCBNEW_DIALOGS}
+    ${PCBNEW_EXPORTERS}
+    ${PCBNEW_IMPORT_DXF}
+
     autorouter/rect_placement/rect_placement.cpp
     autorouter/spread_footprints.cpp
-    tool_modview.cpp
-    modview_frame.cpp
-    pcbframe.cpp
-    pcb_base_edit_frame.cpp
+
     append_board_to_current.cpp
     array_creator.cpp
     attribut.cpp
-    board_netlist_updater.cpp
     block.cpp
     block_module_editor.cpp
+    board_netlist_updater.cpp
     build_BOM_from_board.cpp
-    class_pcb_layer_widget.cpp
+    class_action_plugin.cpp
+    class_footprint_wizard.cpp
     class_pcb_layer_box_selector.cpp
+    class_pcb_layer_widget.cpp
     clean.cpp
     connect.cpp
     controle.cpp
-    dimension.cpp
     cross-probing.cpp
     deltrack.cpp
-    ${PCBNEW_DIALOGS}
-    ${PCBNEW_IMPORT_DXF}
-    ${PCBNEW_EXPORTERS}
+    dimension.cpp
     dragsegm.cpp
     drc.cpp
     drc_clearance_test_functions.cpp
     drc_marker_functions.cpp
     edgemod.cpp
     edit.cpp
-    editedge.cpp
-    editmod.cpp
-    editrack.cpp
-    editrack-part2.cpp
     edit_pcb_text.cpp
     edit_track_width.cpp
+    editedge.cpp
+    editmod.cpp
+    editrack-part2.cpp
+    editrack.cpp
     edtxtmod.cpp
     event_handlers_tracks_vias_sizes.cpp
     files.cpp
@@ -244,24 +244,27 @@ set( PCBNEW_CLASS_SRCS
     magnetic_tracks_functions.cpp
     menubar_modedit.cpp
     menubar_pcbframe.cpp
+    microwave.cpp
     minimun_spanning_tree.cpp
     modedit.cpp
     modedit_onclick.cpp
     modeditoptions.cpp
     moduleframe.cpp
     modules.cpp
+    modview_frame.cpp
     move-drag_pads.cpp
     move_or_drag_track.cpp
-    microwave.cpp
     muwave_command.cpp
     netlist.cpp
     onleftclick.cpp
     onrightclick.cpp
     pad_edition_functions.cpp
-    pcbnew_config.cpp
-    pcbplot.cpp
+    pcb_base_edit_frame.cpp
 #    pcb_draw_panel_gal.cpp
 #    pcb_view.cpp
+    pcbframe.cpp
+    pcbnew_config.cpp
+    pcbplot.cpp
     plot_board_layers.cpp
     plot_brditems_plotter.cpp
     print_board_functions.cpp
@@ -269,49 +272,48 @@ set( PCBNEW_CLASS_SRCS
     ratsnest.cpp
     specctra.cpp
     specctra_export.cpp
-    specctra_keywords.cpp
     specctra_import.cpp
+    specctra_keywords.cpp
     swap_layers.cpp
     target_edit.cpp
     tool_modedit.cpp
+    tool_modview.cpp
     tool_onrightclick.cpp
     tool_pcb.cpp
     toolbars_update_user_interface.cpp
-    tracepcb.cpp
     tr_modif.cpp
+    tracepcb.cpp
     undo_redo.cpp
     zone_filler.cpp
     zones_by_polygon.cpp
     zones_by_polygon_fill_functions.cpp
     zones_functions_for_undo_redo.cpp
     zones_test_and_combine_areas.cpp
-    class_footprint_wizard.cpp
-    class_action_plugin.cpp
 
-    tools/pcb_tool.cpp
-    tools/selection_tool.cpp
-    tools/pcb_selection_conditions.cpp
-    tools/pcb_bright_box.cpp
-    tools/edit_points.cpp
-    tools/edit_constraints.cpp
-    tools/point_editor.cpp
     tools/drawing_tool.cpp
+    tools/edit_constraints.cpp
+    tools/edit_points.cpp
     tools/edit_tool.cpp
-    tools/position_relative_tool.cpp
-    tools/pcbnew_control.cpp
-    tools/pcb_editor_control.cpp
+    tools/grid_helper.cpp
     tools/microwave_tool.cpp
     tools/module_editor_tools.cpp
-    tools/placement_tool.cpp
-    tools/pcb_actions.cpp
-    tools/grid_helper.cpp
     tools/pad_tool.cpp
+    tools/pcb_actions.cpp
+    tools/pcb_bright_box.cpp
+    tools/pcb_editor_control.cpp
+    tools/pcb_selection_conditions.cpp
+    tools/pcb_tool.cpp
+    tools/pcbnew_control.cpp
     tools/picker_tool.cpp
-    tools/zone_create_helper.cpp
-    tools/tools_common.cpp
-    tools/tool_event_utils.cpp
-    tools/size_menu.cpp
+    tools/placement_tool.cpp
+    tools/point_editor.cpp
+    tools/position_relative_tool.cpp
     tools/selection.cpp
+    tools/selection_tool.cpp
+    tools/size_menu.cpp
+    tools/tool_event_utils.cpp
+    tools/tools_common.cpp
+    tools/zone_create_helper.cpp
     tools/zone_filler_tool.cpp
 
     footprint_preview_panel.cpp
@@ -330,16 +332,16 @@ set( PCBNEW_COMMON_SRCS
     )
 
 set( PCBNEW_SCRIPTING_DIALOGS
-    dialogs/dialog_scripting_base.cpp
     dialogs/dialog_scripting.cpp
+    dialogs/dialog_scripting_base.cpp
     )
 
 set( PCBNEW_SCRIPTING_PYTHON_HELPERS
     ../common/swig/wx_python_helpers.cpp
-    swig/python_scripting.cpp
-    swig/pcbnew_scripting_helpers.cpp
-    swig/pcbnew_footprint_wizards.cpp
     swig/pcbnew_action_plugins.cpp
+    swig/pcbnew_footprint_wizards.cpp
+    swig/pcbnew_scripting_helpers.cpp
+    swig/python_scripting.cpp
     )