diff --git a/b_asic/scheduler-gui/__init__.py b/b_asic/scheduler_gui/__init__.py
similarity index 100%
rename from b_asic/scheduler-gui/__init__.py
rename to b_asic/scheduler_gui/__init__.py
diff --git a/b_asic/scheduler-gui/graphics_axes_item.py b/b_asic/scheduler_gui/graphics_axes_item.py
similarity index 100%
rename from b_asic/scheduler-gui/graphics_axes_item.py
rename to b_asic/scheduler_gui/graphics_axes_item.py
diff --git a/b_asic/scheduler-gui/graphics_component_item.py b/b_asic/scheduler_gui/graphics_component_item.py
similarity index 100%
rename from b_asic/scheduler-gui/graphics_component_item.py
rename to b_asic/scheduler_gui/graphics_component_item.py
diff --git a/b_asic/scheduler-gui/graphics_graph_event.py b/b_asic/scheduler_gui/graphics_graph_event.py
similarity index 100%
rename from b_asic/scheduler-gui/graphics_graph_event.py
rename to b_asic/scheduler_gui/graphics_graph_event.py
diff --git a/b_asic/scheduler-gui/graphics_graph_item.py b/b_asic/scheduler_gui/graphics_graph_item.py
similarity index 100%
rename from b_asic/scheduler-gui/graphics_graph_item.py
rename to b_asic/scheduler_gui/graphics_graph_item.py
diff --git a/b_asic/scheduler-gui/graphics_signal.py b/b_asic/scheduler_gui/graphics_signal.py
similarity index 100%
rename from b_asic/scheduler-gui/graphics_signal.py
rename to b_asic/scheduler_gui/graphics_signal.py
diff --git a/b_asic/scheduler-gui/graphics_timeline_item.py b/b_asic/scheduler_gui/graphics_timeline_item.py
similarity index 100%
rename from b_asic/scheduler-gui/graphics_timeline_item.py
rename to b_asic/scheduler_gui/graphics_timeline_item.py
diff --git a/b_asic/scheduler-gui/icons/basic.qrc b/b_asic/scheduler_gui/icons/basic.qrc
similarity index 100%
rename from b_asic/scheduler-gui/icons/basic.qrc
rename to b_asic/scheduler_gui/icons/basic.qrc
diff --git a/b_asic/scheduler-gui/icons/basic/logo.png b/b_asic/scheduler_gui/icons/basic/logo.png
similarity index 100%
rename from b_asic/scheduler-gui/icons/basic/logo.png
rename to b_asic/scheduler_gui/icons/basic/logo.png
diff --git a/b_asic/scheduler-gui/icons/basic/logo_tiny.png b/b_asic/scheduler_gui/icons/basic/logo_tiny.png
similarity index 100%
rename from b_asic/scheduler-gui/icons/basic/logo_tiny.png
rename to b_asic/scheduler_gui/icons/basic/logo_tiny.png
diff --git a/b_asic/scheduler-gui/icons/basic/small_logo.png b/b_asic/scheduler_gui/icons/basic/small_logo.png
similarity index 100%
rename from b_asic/scheduler-gui/icons/basic/small_logo.png
rename to b_asic/scheduler_gui/icons/basic/small_logo.png
diff --git a/b_asic/scheduler-gui/icons/basic_rc.py b/b_asic/scheduler_gui/icons/basic_rc.py
similarity index 100%
rename from b_asic/scheduler-gui/icons/basic_rc.py
rename to b_asic/scheduler_gui/icons/basic_rc.py
diff --git a/b_asic/scheduler-gui/icons/misc.qrc b/b_asic/scheduler_gui/icons/misc.qrc
similarity index 100%
rename from b_asic/scheduler-gui/icons/misc.qrc
rename to b_asic/scheduler_gui/icons/misc.qrc
diff --git a/b_asic/scheduler-gui/icons/misc/right_filled_panel.svg b/b_asic/scheduler_gui/icons/misc/right_filled_panel.svg
similarity index 100%
rename from b_asic/scheduler-gui/icons/misc/right_filled_panel.svg
rename to b_asic/scheduler_gui/icons/misc/right_filled_panel.svg
diff --git a/b_asic/scheduler-gui/icons/misc/right_panel.svg b/b_asic/scheduler_gui/icons/misc/right_panel.svg
similarity index 100%
rename from b_asic/scheduler-gui/icons/misc/right_panel.svg
rename to b_asic/scheduler_gui/icons/misc/right_panel.svg
diff --git a/b_asic/scheduler-gui/icons/misc_rc.py b/b_asic/scheduler_gui/icons/misc_rc.py
similarity index 100%
rename from b_asic/scheduler-gui/icons/misc_rc.py
rename to b_asic/scheduler_gui/icons/misc_rc.py
diff --git a/b_asic/scheduler-gui/logger.py b/b_asic/scheduler_gui/logger.py
similarity index 100%
rename from b_asic/scheduler-gui/logger.py
rename to b_asic/scheduler_gui/logger.py
diff --git a/b_asic/scheduler-gui/main_window.py b/b_asic/scheduler_gui/main_window.py
similarity index 100%
rename from b_asic/scheduler-gui/main_window.py
rename to b_asic/scheduler_gui/main_window.py
diff --git a/b_asic/scheduler-gui/main_window.ui b/b_asic/scheduler_gui/main_window.ui
similarity index 100%
rename from b_asic/scheduler-gui/main_window.ui
rename to b_asic/scheduler_gui/main_window.ui
diff --git a/b_asic/scheduler-gui/tests/demo.py b/b_asic/scheduler_gui/scratchpad/demo.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/demo.py
rename to b_asic/scheduler_gui/scratchpad/demo.py
diff --git a/b_asic/scheduler-gui/tests/graphics_axes_item.py b/b_asic/scheduler_gui/scratchpad/graphics_axes_item.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/graphics_axes_item.py
rename to b_asic/scheduler_gui/scratchpad/graphics_axes_item.py
diff --git a/b_asic/scheduler-gui/tests/graphics_component_event.py b/b_asic/scheduler_gui/scratchpad/graphics_component_event.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/graphics_component_event.py
rename to b_asic/scheduler_gui/scratchpad/graphics_component_event.py
diff --git a/b_asic/scheduler-gui/tests/graphics_scene.py b/b_asic/scheduler_gui/scratchpad/graphics_scene.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/graphics_scene.py
rename to b_asic/scheduler_gui/scratchpad/graphics_scene.py
diff --git a/b_asic/scheduler-gui/tests/graphics_timeline_item.py b/b_asic/scheduler_gui/scratchpad/graphics_timeline_item.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/graphics_timeline_item.py
rename to b_asic/scheduler_gui/scratchpad/graphics_timeline_item.py
diff --git a/b_asic/scheduler-gui/tests/layout_version/component_item.py b/b_asic/scheduler_gui/scratchpad/layout_version/component_item.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/layout_version/component_item.py
rename to b_asic/scheduler_gui/scratchpad/layout_version/component_item.py
diff --git a/b_asic/scheduler-gui/tests/layout_version/main_window.py b/b_asic/scheduler_gui/scratchpad/layout_version/main_window.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/layout_version/main_window.py
rename to b_asic/scheduler_gui/scratchpad/layout_version/main_window.py
diff --git a/b_asic/scheduler-gui/tests/power_bar.py b/b_asic/scheduler_gui/scratchpad/power_bar.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/power_bar.py
rename to b_asic/scheduler_gui/scratchpad/power_bar.py
diff --git a/b_asic/scheduler-gui/tests/schedule-demo.py b/b_asic/scheduler_gui/scratchpad/schedule-demo.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/schedule-demo.py
rename to b_asic/scheduler_gui/scratchpad/schedule-demo.py
diff --git a/b_asic/scheduler-gui/tests/scheduler.py b/b_asic/scheduler_gui/scratchpad/scheduler.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/scheduler.py
rename to b_asic/scheduler_gui/scratchpad/scheduler.py
diff --git a/b_asic/scheduler-gui/tests/scheduler2.py b/b_asic/scheduler_gui/scratchpad/scheduler2.py
similarity index 100%
rename from b_asic/scheduler-gui/tests/scheduler2.py
rename to b_asic/scheduler_gui/scratchpad/scheduler2.py