From 0009789a8df6b8d4562b6e1cbfa75102a7516ea8 Mon Sep 17 00:00:00 2001
From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Thu, 30 May 2019 06:24:38 +0200
Subject: [PATCH] Renamed mograsim to net.mograsim

---
 LogicUI/.project                              |  4 +-
 LogicUI/META-INF/MANIFEST.MF                  | 22 +++++------
 .../componentadapters/ComponentAdapter.java   | 18 ---------
 .../mograsim/logic/ui/ColorHelper.java        |  6 +--
 .../mograsim/logic/ui/LogicExecuter.java      |  4 +-
 .../mograsim/logic/ui/LogicUICanvas.java      | 10 ++---
 .../logic/ui/LogicUIStandaloneGUI.java        |  6 +--
 .../logic/ui/SimpleLogicUIStandalone.java     | 10 ++---
 .../logic/ui/examples/RSLatchExample.java     | 18 ++++-----
 .../mograsim/logic/ui/model/ViewModel.java    |  6 +--
 .../logic/ui/model/components/GUIAndGate.java |  4 +-
 .../ui/model/components/GUIComponent.java     |  6 +--
 .../ui/model/components/GUIManualSwitch.java  | 12 +++---
 .../logic/ui/model/components/GUINotGate.java |  4 +-
 .../logic/ui/model/components/GUIOrGate.java  |  4 +-
 .../components/SimpleRectangularGUIGate.java  |  8 ++--
 .../logic/ui/model/wires/GUIWire.java         | 10 ++---
 .../logic/ui/model/wires/MovablePin.java      |  4 +-
 .../mograsim/logic/ui/model/wires/Pin.java    |  4 +-
 .../logic/ui/model/wires/WireCrossPoint.java  | 12 +++---
 .../ui/modeladapter/LogicModelParameters.java |  2 +-
 .../modeladapter/ViewLogicModelAdapter.java   | 38 +++++++++----------
 .../componentadapters/ComponentAdapter.java   | 18 +++++++++
 .../ManualSwitchAdapter.java                  | 18 ++++-----
 .../componentadapters/SimpleGateAdapter.java  | 18 ++++-----
 SampleERCP/.project                           |  4 +-
 SampleERCP/Application.e4xmi                  | 22 +++++------
 SampleERCP/META-INF/MANIFEST.MF               | 10 ++---
 ...m.rcp.product => net.mograsim.rcp.product} | 18 ++++-----
 SampleERCP/plugin.xml                         | 12 +++---
 .../mograsim/rcp/handlers/AboutHandler.java   |  2 +-
 .../mograsim/rcp/handlers/OpenHandler.java    |  2 +-
 .../mograsim/rcp/handlers/QuitHandler.java    |  2 +-
 .../mograsim/rcp/handlers/SaveHandler.java    |  2 +-
 .../mograsim/rcp/parts/LogicUIPart.java       | 16 ++++----
 .../mograsim/rcp/parts/SamplePart.java        |  2 +-
 .../ExtensibleSplashHandler.java              |  2 +-
 era.mi/.project                               |  2 +-
 era.mi/META-INF/MANIFEST.MF                   | 20 +++++-----
 .../logic/core/components/gates/AndGate.java  | 14 -------
 .../logic/core/components/gates/OrGate.java   | 14 -------
 .../logic/core/wires/WireObserver.java        |  9 -----
 .../{ => net}/mograsim/logic/core/Util.java   |  4 +-
 .../logic/core/components/BasicComponent.java | 10 ++---
 .../logic/core/components/BitDisplay.java     | 12 +++---
 .../mograsim/logic/core/components/Clock.java | 16 ++++----
 .../logic/core/components/Component.java      |  8 ++--
 .../logic/core/components/Connector.java      | 12 +++---
 .../mograsim/logic/core/components/Demux.java | 10 ++---
 .../logic/core/components/ManualSwitch.java   | 10 ++---
 .../logic/core/components/Merger.java         | 14 +++----
 .../mograsim/logic/core/components/Mux.java   | 10 ++---
 .../logic/core/components/Splitter.java       | 12 +++---
 .../logic/core/components/TriStateBuffer.java | 10 ++---
 .../logic/core/components/gates/AndGate.java  | 14 +++++++
 .../core/components/gates/MultiInputGate.java | 14 +++----
 .../logic/core/components/gates/NotGate.java  | 10 ++---
 .../logic/core/components/gates/OrGate.java   | 14 +++++++
 .../logic/core/components/gates/XorGate.java  | 10 ++---
 .../logic/core/tests/ComponentTest.java       | 34 ++++++++---------
 .../mograsim/logic/core/tests/GUITest.java    | 14 +++----
 .../logic/core/tests/TestBitDisplay.java      | 10 ++---
 .../logic/core/timeline/Timeline.java         |  2 +-
 .../logic/core/timeline/TimelineEvent.java    |  2 +-
 .../core/timeline/TimelineEventHandler.java   |  2 +-
 .../mograsim/logic/core/types/Bit.java        |  2 +-
 .../mograsim/logic/core/types/BitVector.java  |  2 +-
 .../logic/core/types/BitVectorFormatter.java  |  6 +--
 .../logic/core/types/ColorDefinition.java     |  2 +-
 .../mograsim/logic/core/types/LogicType.java  |  2 +-
 .../logic/core/types/MutationOperation.java   |  4 +-
 .../logic/core/types/StrictLogicType.java     |  2 +-
 .../mograsim/logic/core/wires/Wire.java       | 14 +++----
 .../logic/core/wires/WireObserver.java        |  9 +++++
 74 files changed, 358 insertions(+), 358 deletions(-)
 delete mode 100644 LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java
 rename LogicUI/src/{ => net}/mograsim/logic/ui/ColorHelper.java (93%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/LogicExecuter.java (96%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/LogicUICanvas.java (92%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/LogicUIStandaloneGUI.java (90%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/SimpleLogicUIStandalone.java (76%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/examples/RSLatchExample.java (81%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/ViewModel.java (96%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/components/GUIAndGate.java (67%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/components/GUIComponent.java (96%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/components/GUIManualSwitch.java (84%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/components/GUINotGate.java (65%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/components/GUIOrGate.java (66%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java (93%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/wires/GUIWire.java (90%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/wires/MovablePin.java (72%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/wires/Pin.java (93%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/model/wires/WireCrossPoint.java (75%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/modeladapter/LogicModelParameters.java (67%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java (82%)
 create mode 100644 LogicUI/src/net/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java
 rename LogicUI/src/{ => net}/mograsim/logic/ui/modeladapter/componentadapters/ManualSwitchAdapter.java (55%)
 rename LogicUI/src/{ => net}/mograsim/logic/ui/modeladapter/componentadapters/SimpleGateAdapter.java (70%)
 rename SampleERCP/{mograsim.rcp.product => net.mograsim.rcp.product} (86%)
 rename SampleERCP/src/{ => net}/mograsim/rcp/handlers/AboutHandler.java (88%)
 rename SampleERCP/src/{ => net}/mograsim/rcp/handlers/OpenHandler.java (88%)
 rename SampleERCP/src/{ => net}/mograsim/rcp/handlers/QuitHandler.java (91%)
 rename SampleERCP/src/{ => net}/mograsim/rcp/handlers/SaveHandler.java (92%)
 rename SampleERCP/src/{ => net}/mograsim/rcp/parts/LogicUIPart.java (76%)
 rename SampleERCP/src/{ => net}/mograsim/rcp/parts/SamplePart.java (97%)
 rename SampleERCP/src/{ => net}/mograsim/rcp/splashhandlers/ExtensibleSplashHandler.java (99%)
 delete mode 100644 era.mi/src/mograsim/logic/core/components/gates/AndGate.java
 delete mode 100644 era.mi/src/mograsim/logic/core/components/gates/OrGate.java
 delete mode 100644 era.mi/src/mograsim/logic/core/wires/WireObserver.java
 rename era.mi/src/{ => net}/mograsim/logic/core/Util.java (97%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/BasicComponent.java (74%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/BitDisplay.java (70%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/Clock.java (68%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/Component.java (72%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/Connector.java (80%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/Demux.java (89%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/ManualSwitch.java (80%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/Merger.java (82%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/Mux.java (90%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/Splitter.java (79%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/TriStateBuffer.java (80%)
 create mode 100644 era.mi/src/net/mograsim/logic/core/components/gates/AndGate.java
 rename era.mi/src/{ => net}/mograsim/logic/core/components/gates/MultiInputGate.java (74%)
 rename era.mi/src/{ => net}/mograsim/logic/core/components/gates/NotGate.java (70%)
 create mode 100644 era.mi/src/net/mograsim/logic/core/components/gates/OrGate.java
 rename era.mi/src/{ => net}/mograsim/logic/core/components/gates/XorGate.java (51%)
 rename era.mi/src/{ => net}/mograsim/logic/core/tests/ComponentTest.java (93%)
 rename era.mi/src/{ => net}/mograsim/logic/core/tests/GUITest.java (95%)
 rename era.mi/src/{ => net}/mograsim/logic/core/tests/TestBitDisplay.java (77%)
 rename era.mi/src/{ => net}/mograsim/logic/core/timeline/Timeline.java (99%)
 rename era.mi/src/{ => net}/mograsim/logic/core/timeline/TimelineEvent.java (91%)
 rename era.mi/src/{ => net}/mograsim/logic/core/timeline/TimelineEventHandler.java (69%)
 rename era.mi/src/{ => net}/mograsim/logic/core/types/Bit.java (98%)
 rename era.mi/src/{ => net}/mograsim/logic/core/types/BitVector.java (99%)
 rename era.mi/src/{ => net}/mograsim/logic/core/types/BitVectorFormatter.java (89%)
 rename era.mi/src/{ => net}/mograsim/logic/core/types/ColorDefinition.java (97%)
 rename era.mi/src/{ => net}/mograsim/logic/core/types/LogicType.java (98%)
 rename era.mi/src/{ => net}/mograsim/logic/core/types/MutationOperation.java (68%)
 rename era.mi/src/{ => net}/mograsim/logic/core/types/StrictLogicType.java (90%)
 rename era.mi/src/{ => net}/mograsim/logic/core/wires/Wire.java (96%)
 create mode 100644 era.mi/src/net/mograsim/logic/core/wires/WireObserver.java

diff --git a/LogicUI/.project b/LogicUI/.project
index 9ba08bbd..8ce0afd8 100644
--- a/LogicUI/.project
+++ b/LogicUI/.project
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>mograsim.logic.ui</name>
+	<name>net.mograsim.logic.ui</name>
 	<comment></comment>
 	<projects>
-		<project>mograsim.logic.core</project>
+		<project>net.mograsim.logic.core</project>
 		<project>SWTZoomableCanvas</project>
 	</projects>
 	<buildSpec>
diff --git a/LogicUI/META-INF/MANIFEST.MF b/LogicUI/META-INF/MANIFEST.MF
index c1dcd55a..24a1c9a2 100644
--- a/LogicUI/META-INF/MANIFEST.MF
+++ b/LogicUI/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: mograsim.logic.ui
-Bundle-SymbolicName: mograsim.logic.ui;singleton:=true
+Bundle-Name: net.mograsim.logic.ui
+Bundle-SymbolicName: net.mograsim.logic.ui;singleton:=true
 Bundle-Version: 1.0.0
-Export-Package: mograsim.logic.ui,
- mograsim.logic.ui.examples,
- mograsim.logic.ui.model,
- mograsim.logic.ui.model.components,
- mograsim.logic.ui.model.wires,
- mograsim.logic.ui.modeladapter,
- mograsim.logic.ui.modeladapter.componentadapters
+Export-Package: net.mograsim.logic.ui,
+ net.mograsim.logic.ui.examples,
+ net.mograsim.logic.ui.model,
+ net.mograsim.logic.ui.model.components,
+ net.mograsim.logic.ui.model.wires,
+ net.mograsim.logic.ui.modeladapter,
+ net.mograsim.logic.ui.modeladapter.componentadapters
 Bundle-RequiredExecutionEnvironment: JavaSE-10
 Require-Bundle: org.eclipse.swt;bundle-version="3.110.0",
  SWTZoomableCanvas;bundle-version="1.0.0";visibility:=reexport,
- mograsim.logic.core;bundle-version="1.0.0";visibility:=reexport
-Automatic-Module-Name: mograsim.logic.ui
+ net.mograsim.logic.core;bundle-version="1.0.0";visibility:=reexport
+Automatic-Module-Name: net.mograsim.logic.ui
diff --git a/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java b/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java
deleted file mode 100644
index 9be1b96e..00000000
--- a/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package mograsim.logic.ui.modeladapter.componentadapters;
-
-import java.util.Map;
-
-import mograsim.logic.core.components.Component;
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.wires.Wire;
-import mograsim.logic.ui.model.components.GUIComponent;
-import mograsim.logic.ui.model.wires.Pin;
-import mograsim.logic.ui.modeladapter.LogicModelParameters;
-
-public interface ComponentAdapter<G extends GUIComponent>
-{
-	public Class<G> getSupportedClass();
-
-	public Component createAndLinkComponent(Timeline timeline, LogicModelParameters params, G guiComponent,
-			Map<Pin, Wire> logicWiresPerPin);
-}
\ No newline at end of file
diff --git a/LogicUI/src/mograsim/logic/ui/ColorHelper.java b/LogicUI/src/net/mograsim/logic/ui/ColorHelper.java
similarity index 93%
rename from LogicUI/src/mograsim/logic/ui/ColorHelper.java
rename to LogicUI/src/net/mograsim/logic/ui/ColorHelper.java
index 886c6f76..b6315072 100644
--- a/LogicUI/src/mograsim/logic/ui/ColorHelper.java
+++ b/LogicUI/src/net/mograsim/logic/ui/ColorHelper.java
@@ -1,4 +1,4 @@
-package mograsim.logic.ui;
+package net.mograsim.logic.ui;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -7,9 +7,9 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Device;
 
-import mograsim.logic.core.types.ColorDefinition;
-import mograsim.logic.core.types.ColorDefinition.BuiltInColor;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
+import net.mograsim.logic.core.types.ColorDefinition;
+import net.mograsim.logic.core.types.ColorDefinition.BuiltInColor;
 
 //TODO replace with a proper ColorManager
 public class ColorHelper
diff --git a/LogicUI/src/mograsim/logic/ui/LogicExecuter.java b/LogicUI/src/net/mograsim/logic/ui/LogicExecuter.java
similarity index 96%
rename from LogicUI/src/mograsim/logic/ui/LogicExecuter.java
rename to LogicUI/src/net/mograsim/logic/ui/LogicExecuter.java
index dec5c53a..fadfbe94 100644
--- a/LogicUI/src/mograsim/logic/ui/LogicExecuter.java
+++ b/LogicUI/src/net/mograsim/logic/ui/LogicExecuter.java
@@ -1,9 +1,9 @@
-package mograsim.logic.ui;
+package net.mograsim.logic.ui;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.timeline.Timeline;
 
 //TODO maybe move to logic core?
 public class LogicExecuter
diff --git a/LogicUI/src/mograsim/logic/ui/LogicUICanvas.java b/LogicUI/src/net/mograsim/logic/ui/LogicUICanvas.java
similarity index 92%
rename from LogicUI/src/mograsim/logic/ui/LogicUICanvas.java
rename to LogicUI/src/net/mograsim/logic/ui/LogicUICanvas.java
index 4761839b..3a080973 100644
--- a/LogicUI/src/mograsim/logic/ui/LogicUICanvas.java
+++ b/LogicUI/src/net/mograsim/logic/ui/LogicUICanvas.java
@@ -1,4 +1,4 @@
-package mograsim.logic.ui;
+package net.mograsim.logic.ui;
 
 import java.util.function.Consumer;
 
@@ -6,14 +6,14 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 
-import mograsim.logic.ui.model.ViewModel;
-import mograsim.logic.ui.model.components.GUIComponent;
-import mograsim.logic.ui.model.wires.GUIWire;
-import mograsim.logic.ui.model.wires.Pin;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.model.wires.GUIWire;
+import net.mograsim.logic.ui.model.wires.Pin;
 
 /**
  * Simulation visualizer canvas.
diff --git a/LogicUI/src/mograsim/logic/ui/LogicUIStandaloneGUI.java b/LogicUI/src/net/mograsim/logic/ui/LogicUIStandaloneGUI.java
similarity index 90%
rename from LogicUI/src/mograsim/logic/ui/LogicUIStandaloneGUI.java
rename to LogicUI/src/net/mograsim/logic/ui/LogicUIStandaloneGUI.java
index f39727c8..64b442e3 100644
--- a/LogicUI/src/mograsim/logic/ui/LogicUIStandaloneGUI.java
+++ b/LogicUI/src/net/mograsim/logic/ui/LogicUIStandaloneGUI.java
@@ -1,14 +1,14 @@
-package mograsim.logic.ui;
+package net.mograsim.logic.ui;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
-import mograsim.logic.ui.model.ViewModel;
-import mograsim.logic.ui.modeladapter.LogicModelParameters;
 import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasOverlay;
 import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
 
 /**
  * Standalone simulation visualizer graphical user interface.
diff --git a/LogicUI/src/mograsim/logic/ui/SimpleLogicUIStandalone.java b/LogicUI/src/net/mograsim/logic/ui/SimpleLogicUIStandalone.java
similarity index 76%
rename from LogicUI/src/mograsim/logic/ui/SimpleLogicUIStandalone.java
rename to LogicUI/src/net/mograsim/logic/ui/SimpleLogicUIStandalone.java
index ef0beb32..aa1dd57a 100644
--- a/LogicUI/src/mograsim/logic/ui/SimpleLogicUIStandalone.java
+++ b/LogicUI/src/net/mograsim/logic/ui/SimpleLogicUIStandalone.java
@@ -1,11 +1,11 @@
-package mograsim.logic.ui;
+package net.mograsim.logic.ui;
 
 import java.util.function.Consumer;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.ui.model.ViewModel;
-import mograsim.logic.ui.modeladapter.LogicModelParameters;
-import mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
+import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
 
 public class SimpleLogicUIStandalone
 {
diff --git a/LogicUI/src/mograsim/logic/ui/examples/RSLatchExample.java b/LogicUI/src/net/mograsim/logic/ui/examples/RSLatchExample.java
similarity index 81%
rename from LogicUI/src/mograsim/logic/ui/examples/RSLatchExample.java
rename to LogicUI/src/net/mograsim/logic/ui/examples/RSLatchExample.java
index f787c815..af91d1f1 100644
--- a/LogicUI/src/mograsim/logic/ui/examples/RSLatchExample.java
+++ b/LogicUI/src/net/mograsim/logic/ui/examples/RSLatchExample.java
@@ -1,12 +1,12 @@
-package mograsim.logic.ui.examples;
-
-import mograsim.logic.ui.SimpleLogicUIStandalone;
-import mograsim.logic.ui.model.ViewModel;
-import mograsim.logic.ui.model.components.GUIManualSwitch;
-import mograsim.logic.ui.model.components.GUINotGate;
-import mograsim.logic.ui.model.components.GUIOrGate;
-import mograsim.logic.ui.model.wires.GUIWire;
-import mograsim.logic.ui.model.wires.WireCrossPoint;
+package net.mograsim.logic.ui.examples;
+
+import net.mograsim.logic.ui.SimpleLogicUIStandalone;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.components.GUIManualSwitch;
+import net.mograsim.logic.ui.model.components.GUINotGate;
+import net.mograsim.logic.ui.model.components.GUIOrGate;
+import net.mograsim.logic.ui.model.wires.GUIWire;
+import net.mograsim.logic.ui.model.wires.WireCrossPoint;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 
 public class RSLatchExample
diff --git a/LogicUI/src/mograsim/logic/ui/model/ViewModel.java b/LogicUI/src/net/mograsim/logic/ui/model/ViewModel.java
similarity index 96%
rename from LogicUI/src/mograsim/logic/ui/model/ViewModel.java
rename to LogicUI/src/net/mograsim/logic/ui/model/ViewModel.java
index 31cd1a8e..717ee13a 100644
--- a/LogicUI/src/mograsim/logic/ui/model/ViewModel.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/ViewModel.java
@@ -1,12 +1,12 @@
-package mograsim.logic.ui.model;
+package net.mograsim.logic.ui.model;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 
-import mograsim.logic.ui.model.components.GUIComponent;
-import mograsim.logic.ui.model.wires.GUIWire;
+import net.mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.model.wires.GUIWire;
 
 public class ViewModel
 {
diff --git a/LogicUI/src/mograsim/logic/ui/model/components/GUIAndGate.java b/LogicUI/src/net/mograsim/logic/ui/model/components/GUIAndGate.java
similarity index 67%
rename from LogicUI/src/mograsim/logic/ui/model/components/GUIAndGate.java
rename to LogicUI/src/net/mograsim/logic/ui/model/components/GUIAndGate.java
index 8efea1c4..440881df 100644
--- a/LogicUI/src/mograsim/logic/ui/model/components/GUIAndGate.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/components/GUIAndGate.java
@@ -1,6 +1,6 @@
-package mograsim.logic.ui.model.components;
+package net.mograsim.logic.ui.model.components;
 
-import mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.ViewModel;
 
 public class GUIAndGate extends SimpleRectangularGUIGate
 {
diff --git a/LogicUI/src/mograsim/logic/ui/model/components/GUIComponent.java b/LogicUI/src/net/mograsim/logic/ui/model/components/GUIComponent.java
similarity index 96%
rename from LogicUI/src/mograsim/logic/ui/model/components/GUIComponent.java
rename to LogicUI/src/net/mograsim/logic/ui/model/components/GUIComponent.java
index c3e4529f..9cea86a6 100644
--- a/LogicUI/src/mograsim/logic/ui/model/components/GUIComponent.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/components/GUIComponent.java
@@ -1,12 +1,12 @@
-package mograsim.logic.ui.model.components;
+package net.mograsim.logic.ui.model.components;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 
-import mograsim.logic.ui.model.ViewModel;
-import mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.wires.Pin;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 
diff --git a/LogicUI/src/mograsim/logic/ui/model/components/GUIManualSwitch.java b/LogicUI/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java
similarity index 84%
rename from LogicUI/src/mograsim/logic/ui/model/components/GUIManualSwitch.java
rename to LogicUI/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java
index a89bc6a6..8ca57ee5 100644
--- a/LogicUI/src/mograsim/logic/ui/model/components/GUIManualSwitch.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java
@@ -1,14 +1,14 @@
-package mograsim.logic.ui.model.components;
+package net.mograsim.logic.ui.model.components;
 
-import mograsim.logic.core.components.ManualSwitch;
-import mograsim.logic.core.types.BitVectorFormatter;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.ui.model.ViewModel;
-import mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.wires.Pin;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
+import net.mograsim.logic.core.components.ManualSwitch;
+import net.mograsim.logic.core.types.BitVectorFormatter;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
 
 public class GUIManualSwitch extends GUIComponent
 {
diff --git a/LogicUI/src/mograsim/logic/ui/model/components/GUINotGate.java b/LogicUI/src/net/mograsim/logic/ui/model/components/GUINotGate.java
similarity index 65%
rename from LogicUI/src/mograsim/logic/ui/model/components/GUINotGate.java
rename to LogicUI/src/net/mograsim/logic/ui/model/components/GUINotGate.java
index 7a6865f3..01df349b 100644
--- a/LogicUI/src/mograsim/logic/ui/model/components/GUINotGate.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/components/GUINotGate.java
@@ -1,6 +1,6 @@
-package mograsim.logic.ui.model.components;
+package net.mograsim.logic.ui.model.components;
 
-import mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.ViewModel;
 
 public class GUINotGate extends SimpleRectangularGUIGate
 {
diff --git a/LogicUI/src/mograsim/logic/ui/model/components/GUIOrGate.java b/LogicUI/src/net/mograsim/logic/ui/model/components/GUIOrGate.java
similarity index 66%
rename from LogicUI/src/mograsim/logic/ui/model/components/GUIOrGate.java
rename to LogicUI/src/net/mograsim/logic/ui/model/components/GUIOrGate.java
index 3a3c3241..bbc436d7 100644
--- a/LogicUI/src/mograsim/logic/ui/model/components/GUIOrGate.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/components/GUIOrGate.java
@@ -1,6 +1,6 @@
-package mograsim.logic.ui.model.components;
+package net.mograsim.logic.ui.model.components;
 
-import mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.ViewModel;
 
 public class GUIOrGate extends SimpleRectangularGUIGate
 {
diff --git a/LogicUI/src/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java b/LogicUI/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
similarity index 93%
rename from LogicUI/src/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
rename to LogicUI/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
index b09d9c9d..a2875c6a 100644
--- a/LogicUI/src/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
@@ -1,12 +1,12 @@
-package mograsim.logic.ui.model.components;
+package net.mograsim.logic.ui.model.components;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import mograsim.logic.ui.model.ViewModel;
-import mograsim.logic.ui.model.wires.MovablePin;
-import mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.wires.MovablePin;
+import net.mograsim.logic.ui.model.wires.Pin;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
diff --git a/LogicUI/src/mograsim/logic/ui/model/wires/GUIWire.java b/LogicUI/src/net/mograsim/logic/ui/model/wires/GUIWire.java
similarity index 90%
rename from LogicUI/src/mograsim/logic/ui/model/wires/GUIWire.java
rename to LogicUI/src/net/mograsim/logic/ui/model/wires/GUIWire.java
index 2512b884..736c0ea6 100644
--- a/LogicUI/src/mograsim/logic/ui/model/wires/GUIWire.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/wires/GUIWire.java
@@ -1,15 +1,15 @@
-package mograsim.logic.ui.model.wires;
+package net.mograsim.logic.ui.model.wires;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-import mograsim.logic.core.types.BitVectorFormatter;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.ui.ColorHelper;
-import mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.ColorHelper;
+import net.mograsim.logic.ui.model.ViewModel;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
+import net.mograsim.logic.core.types.BitVectorFormatter;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
 
 public class GUIWire
 {
diff --git a/LogicUI/src/mograsim/logic/ui/model/wires/MovablePin.java b/LogicUI/src/net/mograsim/logic/ui/model/wires/MovablePin.java
similarity index 72%
rename from LogicUI/src/mograsim/logic/ui/model/wires/MovablePin.java
rename to LogicUI/src/net/mograsim/logic/ui/model/wires/MovablePin.java
index 40364320..669bb1be 100644
--- a/LogicUI/src/mograsim/logic/ui/model/wires/MovablePin.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/wires/MovablePin.java
@@ -1,6 +1,6 @@
-package mograsim.logic.ui.model.wires;
+package net.mograsim.logic.ui.model.wires;
 
-import mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.model.components.GUIComponent;
 
 public class MovablePin extends Pin
 {
diff --git a/LogicUI/src/mograsim/logic/ui/model/wires/Pin.java b/LogicUI/src/net/mograsim/logic/ui/model/wires/Pin.java
similarity index 93%
rename from LogicUI/src/mograsim/logic/ui/model/wires/Pin.java
rename to LogicUI/src/net/mograsim/logic/ui/model/wires/Pin.java
index 350de8d2..f3a78023 100644
--- a/LogicUI/src/mograsim/logic/ui/model/wires/Pin.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/wires/Pin.java
@@ -1,10 +1,10 @@
-package mograsim.logic.ui.model.wires;
+package net.mograsim.logic.ui.model.wires;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-import mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.model.components.GUIComponent;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 
diff --git a/LogicUI/src/mograsim/logic/ui/model/wires/WireCrossPoint.java b/LogicUI/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
similarity index 75%
rename from LogicUI/src/mograsim/logic/ui/model/wires/WireCrossPoint.java
rename to LogicUI/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
index 34f69032..0949ffbb 100644
--- a/LogicUI/src/mograsim/logic/ui/model/wires/WireCrossPoint.java
+++ b/LogicUI/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
@@ -1,12 +1,12 @@
-package mograsim.logic.ui.model.wires;
+package net.mograsim.logic.ui.model.wires;
 
-import mograsim.logic.core.types.BitVectorFormatter;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.ui.ColorHelper;
-import mograsim.logic.ui.model.ViewModel;
-import mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.ColorHelper;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.components.GUIComponent;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
+import net.mograsim.logic.core.types.BitVectorFormatter;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
 
 public class WireCrossPoint extends GUIComponent
 {
diff --git a/LogicUI/src/mograsim/logic/ui/modeladapter/LogicModelParameters.java b/LogicUI/src/net/mograsim/logic/ui/modeladapter/LogicModelParameters.java
similarity index 67%
rename from LogicUI/src/mograsim/logic/ui/modeladapter/LogicModelParameters.java
rename to LogicUI/src/net/mograsim/logic/ui/modeladapter/LogicModelParameters.java
index 010cdd1f..d75cb1b9 100644
--- a/LogicUI/src/mograsim/logic/ui/modeladapter/LogicModelParameters.java
+++ b/LogicUI/src/net/mograsim/logic/ui/modeladapter/LogicModelParameters.java
@@ -1,4 +1,4 @@
-package mograsim.logic.ui.modeladapter;
+package net.mograsim.logic.ui.modeladapter;
 
 public class LogicModelParameters
 {
diff --git a/LogicUI/src/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java b/LogicUI/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
similarity index 82%
rename from LogicUI/src/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
rename to LogicUI/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
index 076d64b6..6f4e7b73 100644
--- a/LogicUI/src/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
+++ b/LogicUI/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
@@ -1,4 +1,4 @@
-package mograsim.logic.ui.modeladapter;
+package net.mograsim.logic.ui.modeladapter;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -11,24 +11,24 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import mograsim.logic.core.components.Component;
-import mograsim.logic.core.components.gates.AndGate;
-import mograsim.logic.core.components.gates.NotGate;
-import mograsim.logic.core.components.gates.OrGate;
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.wires.Wire;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.ui.model.ViewModel;
-import mograsim.logic.ui.model.components.GUIAndGate;
-import mograsim.logic.ui.model.components.GUIComponent;
-import mograsim.logic.ui.model.components.GUINotGate;
-import mograsim.logic.ui.model.components.GUIOrGate;
-import mograsim.logic.ui.model.wires.GUIWire;
-import mograsim.logic.ui.model.wires.Pin;
-import mograsim.logic.ui.model.wires.WireCrossPoint;
-import mograsim.logic.ui.modeladapter.componentadapters.ComponentAdapter;
-import mograsim.logic.ui.modeladapter.componentadapters.ManualSwitchAdapter;
-import mograsim.logic.ui.modeladapter.componentadapters.SimpleGateAdapter;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.components.GUIAndGate;
+import net.mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.model.components.GUINotGate;
+import net.mograsim.logic.ui.model.components.GUIOrGate;
+import net.mograsim.logic.ui.model.wires.GUIWire;
+import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.model.wires.WireCrossPoint;
+import net.mograsim.logic.ui.modeladapter.componentadapters.ComponentAdapter;
+import net.mograsim.logic.ui.modeladapter.componentadapters.ManualSwitchAdapter;
+import net.mograsim.logic.ui.modeladapter.componentadapters.SimpleGateAdapter;
+import net.mograsim.logic.core.components.Component;
+import net.mograsim.logic.core.components.gates.AndGate;
+import net.mograsim.logic.core.components.gates.NotGate;
+import net.mograsim.logic.core.components.gates.OrGate;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.wires.Wire;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
 
 public class ViewLogicModelAdapter
 {
diff --git a/LogicUI/src/net/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java b/LogicUI/src/net/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java
new file mode 100644
index 00000000..0dd563e5
--- /dev/null
+++ b/LogicUI/src/net/mograsim/logic/ui/modeladapter/componentadapters/ComponentAdapter.java
@@ -0,0 +1,18 @@
+package net.mograsim.logic.ui.modeladapter.componentadapters;
+
+import java.util.Map;
+
+import net.mograsim.logic.ui.model.components.GUIComponent;
+import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
+import net.mograsim.logic.core.components.Component;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.wires.Wire;
+
+public interface ComponentAdapter<G extends GUIComponent>
+{
+	public Class<G> getSupportedClass();
+
+	public Component createAndLinkComponent(Timeline timeline, LogicModelParameters params, G guiComponent,
+			Map<Pin, Wire> logicWiresPerPin);
+}
\ No newline at end of file
diff --git a/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ManualSwitchAdapter.java b/LogicUI/src/net/mograsim/logic/ui/modeladapter/componentadapters/ManualSwitchAdapter.java
similarity index 55%
rename from LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ManualSwitchAdapter.java
rename to LogicUI/src/net/mograsim/logic/ui/modeladapter/componentadapters/ManualSwitchAdapter.java
index c27cbdf2..197cf747 100644
--- a/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/ManualSwitchAdapter.java
+++ b/LogicUI/src/net/mograsim/logic/ui/modeladapter/componentadapters/ManualSwitchAdapter.java
@@ -1,15 +1,15 @@
-package mograsim.logic.ui.modeladapter.componentadapters;
+package net.mograsim.logic.ui.modeladapter.componentadapters;
 
 import java.util.Map;
 
-import mograsim.logic.core.components.Component;
-import mograsim.logic.core.components.ManualSwitch;
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.wires.Wire;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
-import mograsim.logic.ui.model.components.GUIManualSwitch;
-import mograsim.logic.ui.model.wires.Pin;
-import mograsim.logic.ui.modeladapter.LogicModelParameters;
+import net.mograsim.logic.ui.model.components.GUIManualSwitch;
+import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
+import net.mograsim.logic.core.components.Component;
+import net.mograsim.logic.core.components.ManualSwitch;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.wires.Wire;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public class ManualSwitchAdapter implements ComponentAdapter<GUIManualSwitch>
 {
diff --git a/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/SimpleGateAdapter.java b/LogicUI/src/net/mograsim/logic/ui/modeladapter/componentadapters/SimpleGateAdapter.java
similarity index 70%
rename from LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/SimpleGateAdapter.java
rename to LogicUI/src/net/mograsim/logic/ui/modeladapter/componentadapters/SimpleGateAdapter.java
index f88308bd..1902d626 100644
--- a/LogicUI/src/mograsim/logic/ui/modeladapter/componentadapters/SimpleGateAdapter.java
+++ b/LogicUI/src/net/mograsim/logic/ui/modeladapter/componentadapters/SimpleGateAdapter.java
@@ -1,16 +1,16 @@
-package mograsim.logic.ui.modeladapter.componentadapters;
+package net.mograsim.logic.ui.modeladapter.componentadapters;
 
 import java.util.List;
 import java.util.Map;
 
-import mograsim.logic.core.components.Component;
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.wires.Wire;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
-import mograsim.logic.ui.model.components.SimpleRectangularGUIGate;
-import mograsim.logic.ui.model.wires.Pin;
-import mograsim.logic.ui.modeladapter.LogicModelParameters;
+import net.mograsim.logic.ui.model.components.SimpleRectangularGUIGate;
+import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
+import net.mograsim.logic.core.components.Component;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.wires.Wire;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public class SimpleGateAdapter<G extends SimpleRectangularGUIGate> implements ComponentAdapter<G>
 {
diff --git a/SampleERCP/.project b/SampleERCP/.project
index 4577bb5e..52ed0888 100644
--- a/SampleERCP/.project
+++ b/SampleERCP/.project
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>mograsim.rcp</name>
+	<name>net.mograsim.rcp</name>
 	<comment></comment>
 	<projects>
-		<project>mograsim.rcp</project>
+		<project>net.mograsim.rcp</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/SampleERCP/Application.e4xmi b/SampleERCP/Application.e4xmi
index 75815684..3caa9c19 100644
--- a/SampleERCP/Application.e4xmi
+++ b/SampleERCP/Application.e4xmi
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_6wlLcMgZEeSyMNYR5xypkQ" elementId="Sample.application" bindingContexts="_6wlLecgZEeSyMNYR5xypkQ">
-  <children xsi:type="basic:TrimmedWindow" xmi:id="_6wlLccgZEeSyMNYR5xypkQ" elementId="Sample.window.main" label="Sample RCP4" iconURI="platform:/plugin/mograsim.rcp/icons/app/ico_16t.png" width="500" height="400">
+  <children xsi:type="basic:TrimmedWindow" xmi:id="_6wlLccgZEeSyMNYR5xypkQ" elementId="Sample.window.main" label="Sample RCP4" iconURI="platform:/plugin/net.mograsim.rcp/icons/app/ico_16t.png" width="500" height="400">
     <children xsi:type="basic:PartSashContainer" xmi:id="_6wlLksgZEeSyMNYR5xypkQ" elementId="Sample.partsashcontainer.sample">
       <children xsi:type="basic:PartStack" xmi:id="_6wlLk8gZEeSyMNYR5xypkQ" elementId="Sample.partstack.sample">
-        <children xsi:type="basic:Part" xmi:id="_6wlLlMgZEeSyMNYR5xypkQ" elementId="Sample.part.sample" contributionURI="bundleclass://mograsim.rcp/mograsim.rcp.parts.SamplePart" label="Sample Part" iconURI="platform:/plugin/mograsim.rcp/icons/home.png"/>
-        <children xsi:type="basic:Part" xmi:id="_cldhcH1HEema06ZDPR6BSw" elementId="mograsim.rcp.part.logicui" contributionURI="bundleclass://mograsim.rcp/mograsim.rcp.parts.LogicUIPart" label="LogicUI part"/>
+        <children xsi:type="basic:Part" xmi:id="_6wlLlMgZEeSyMNYR5xypkQ" elementId="Sample.part.sample" contributionURI="bundleclass://net.mograsim.rcp/net.mograsim.rcp.parts.SamplePart" label="Sample Part" iconURI="platform:/plugin/net.mograsim.rcp/icons/home.png"/>
+        <children xsi:type="basic:Part" xmi:id="_cldhcH1HEema06ZDPR6BSw" elementId="net.mograsim.rcp.part.logicui" contributionURI="bundleclass://net.mograsim.rcp/net.mograsim.rcp.parts.LogicUIPart" label="LogicUI part"/>
       </children>
       <children xsi:type="basic:PartStack" xmi:id="_l2EzYG6wEemo__tDmTCqCQ" elementId="sample.partstack.0">
         <children xsi:type="basic:Part" xmi:id="_mW1XEG6wEemo__tDmTCqCQ" elementId="sample.part.none" label="None" tooltip="Something"/>
@@ -12,8 +12,8 @@
     </children>
     <mainMenu xmi:id="_6wlLicgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.main.menu">
       <children xsi:type="menu:Menu" xmi:id="_6wlLisgZEeSyMNYR5xypkQ" elementId="file" label="File">
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLi8gZEeSyMNYR5xypkQ" elementId="Sample.handleditem.file.open" label="Open" iconURI="platform:/plugin/mograsim.rcp/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjMgZEeSyMNYR5xypkQ" elementId="Sample.handleditem.save" label="Save" iconURI="platform:/plugin/mograsim.rcp/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLi8gZEeSyMNYR5xypkQ" elementId="Sample.handleditem.file.open" label="Open" iconURI="platform:/plugin/net.mograsim.rcp/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjMgZEeSyMNYR5xypkQ" elementId="Sample.handleditem.save" label="Save" iconURI="platform:/plugin/net.mograsim.rcp/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjcgZEeSyMNYR5xypkQ" elementId="Sample.handleditem.quit" label="Quit" command="_6wlLfMgZEeSyMNYR5xypkQ"/>
       </children>
       <children xsi:type="menu:Menu" xmi:id="_6wlLjsgZEeSyMNYR5xypkQ" elementId="help" label="Help">
@@ -22,15 +22,15 @@
     </mainMenu>
     <trimBars xmi:id="_6wlLlcgZEeSyMNYR5xypkQ" elementId="Sample.trimbar.top">
       <children xsi:type="menu:ToolBar" xmi:id="_6wlLlsgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.main.toolbar">
-        <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLmMgZEeSyMNYR5xypkQ" elementId="Sample.handleditem.trimbar.top.save" iconURI="platform:/plugin/mograsim.rcp/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLl8gZEeSyMNYR5xypkQ" elementId="Sample.handleditem.trimbar.top.open" iconURI="platform:/plugin/mograsim.rcp/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLmMgZEeSyMNYR5xypkQ" elementId="Sample.handleditem.trimbar.top.save" iconURI="platform:/plugin/net.mograsim.rcp/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLl8gZEeSyMNYR5xypkQ" elementId="Sample.handleditem.trimbar.top.open" iconURI="platform:/plugin/net.mograsim.rcp/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
       </children>
     </trimBars>
   </children>
-  <handlers xmi:id="_6wlLfcgZEeSyMNYR5xypkQ" elementId="sample.handler.quitCommand" contributionURI="bundleclass://mograsim.rcp/mograsim.rcp.handlers.QuitHandler" command="_6wlLfMgZEeSyMNYR5xypkQ"/>
-  <handlers xmi:id="_6wlLgcgZEeSyMNYR5xypkQ" elementId="sample.handler.openCommand" contributionURI="bundleclass://mograsim.rcp/mograsim.rcp.handlers.OpenHandler" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
-  <handlers xmi:id="_6wlLhMgZEeSyMNYR5xypkQ" elementId="sample.handler.saveCommand" contributionURI="bundleclass://mograsim.rcp/mograsim.rcp.handlers.SaveHandler" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
-  <handlers xmi:id="_6wlLh8gZEeSyMNYR5xypkQ" elementId="sample.handler.aboutCommand" contributionURI="bundleclass://mograsim.rcp/mograsim.rcp.handlers.AboutHandler" command="_6wlLhsgZEeSyMNYR5xypkQ"/>
+  <handlers xmi:id="_6wlLfcgZEeSyMNYR5xypkQ" elementId="sample.handler.quitCommand" contributionURI="bundleclass://net.mograsim.rcp/net.mograsim.rcp.handlers.QuitHandler" command="_6wlLfMgZEeSyMNYR5xypkQ"/>
+  <handlers xmi:id="_6wlLgcgZEeSyMNYR5xypkQ" elementId="sample.handler.openCommand" contributionURI="bundleclass://net.mograsim.rcp/net.mograsim.rcp.handlers.OpenHandler" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
+  <handlers xmi:id="_6wlLhMgZEeSyMNYR5xypkQ" elementId="sample.handler.saveCommand" contributionURI="bundleclass://net.mograsim.rcp/net.mograsim.rcp.handlers.SaveHandler" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
+  <handlers xmi:id="_6wlLh8gZEeSyMNYR5xypkQ" elementId="sample.handler.aboutCommand" contributionURI="bundleclass://net.mograsim.rcp/net.mograsim.rcp.handlers.AboutHandler" command="_6wlLhsgZEeSyMNYR5xypkQ"/>
   <bindingTables xmi:id="_6wlLfsgZEeSyMNYR5xypkQ" elementId="Sample.bindingtable" bindingContext="_6wlLecgZEeSyMNYR5xypkQ">
     <bindings xmi:id="_6wlLf8gZEeSyMNYR5xypkQ" elementId="Sample.keybinding.m1q" keySequence="M1+Q" command="_6wlLfMgZEeSyMNYR5xypkQ"/>
     <bindings xmi:id="_6wlLgsgZEeSyMNYR5xypkQ" elementId="Sample.keybinding.m1o" keySequence="M1+O" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
diff --git a/SampleERCP/META-INF/MANIFEST.MF b/SampleERCP/META-INF/MANIFEST.MF
index 2597b53f..1c5e2a77 100644
--- a/SampleERCP/META-INF/MANIFEST.MF
+++ b/SampleERCP/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: mograsim.rcp;singleton:=true
+Bundle-SymbolicName: net.mograsim.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.15.200",
@@ -12,9 +12,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.15.200",
  org.eclipse.e4.ui.di;bundle-version="1.2.500",
  org.eclipse.ui.workbench;bundle-version="3.113.0",
  javax.annotation;bundle-version="1.2.0",
- mograsim.logic.ui
+ net.mograsim.logic.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: Sample
-Export-Package: mograsim.rcp.handlers;uses:="org.eclipse.swt.widgets,org.eclipse.e4.ui.workbench,org.eclipse.e4.ui.workbench.modeling",
- mograsim.rcp.parts;uses:="org.eclipse.swt.widgets",
- mograsim.rcp.splashhandlers
+Export-Package: net.mograsim.rcp.handlers;uses:="org.eclipse.swt.widgets,org.eclipse.e4.ui.workbench,org.eclipse.e4.ui.workbench.modeling",
+ net.mograsim.rcp.parts;uses:="org.eclipse.swt.widgets",
+ net.mograsim.rcp.splashhandlers
diff --git a/SampleERCP/mograsim.rcp.product b/SampleERCP/net.mograsim.rcp.product
similarity index 86%
rename from SampleERCP/mograsim.rcp.product
rename to SampleERCP/net.mograsim.rcp.product
index 3614ce7d..829a7b59 100644
--- a/SampleERCP/mograsim.rcp.product
+++ b/SampleERCP/net.mograsim.rcp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Simulator WIP" uid="sample" id="mograsim.rcp.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="Simulator WIP" uid="sample" id="net.mograsim.rcp.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -19,15 +19,15 @@
       </vmArgsMac>
    </launcherArgs>
 
-   <windowImages i16="/mograsim.rcp/icons/app/ico_16t.png" i32="/mograsim.rcp/icons/app/ico_32t.png" i48="/mograsim.rcp/icons/app/ico_48t.png" i64="/mograsim.rcp/icons/app/ico_64t.png" i128="/mograsim.rcp/icons/app/ico_128t.png" i256="/mograsim.rcp/icons/app/ico_256t.png"/>
+   <windowImages i16="/net.mograsim.rcp/icons/app/ico_16t.png" i32="/net.mograsim.rcp/icons/app/ico_32t.png" i48="/net.mograsim.rcp/icons/app/ico_48t.png" i64="/net.mograsim.rcp/icons/app/ico_64t.png" i128="/net.mograsim.rcp/icons/app/ico_128t.png" i256="/net.mograsim.rcp/icons/app/ico_256t.png"/>
 
    <splash
       handlerType="extensible" />
    <launcher name="Sample">
-      <linux icon="/mograsim.rcp/icons/app/ico_256t.xpm"/>
-      <macosx icon="/mograsim.rcp/icons/app/ico_256t.icns"/>
+      <linux icon="/net.mograsim.rcp/icons/app/ico_256t.xpm"/>
+      <macosx icon="/net.mograsim.rcp/icons/app/ico_256t.icns"/>
       <win useIco="true">
-         <ico path="/mograsim.rcp/icons/app/ico_all.ico"/>
+         <ico path="/net.mograsim.rcp/icons/app/ico_all.ico"/>
          <bmp/>
       </win>
    </launcher>
@@ -66,9 +66,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
       <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
       <plugin id="javax.xml"/>
-      <plugin id="mograsim.logic.core"/>
-      <plugin id="mograsim.logic.ui"/>
-      <plugin id="mograsim.rcp"/>
+      <plugin id="net.mograsim.logic.core"/>
+      <plugin id="net.mograsim.logic.ui"/>
+      <plugin id="net.mograsim.rcp"/>
       <plugin id="org.apache.batik.constants"/>
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.i18n"/>
@@ -143,7 +143,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
    </preferencesInfo>
 
    <cssInfo>
-      <file path="/mograsim.rcp/css/default.css"/>
+      <file path="/net.mograsim.rcp/css/default.css"/>
    </cssInfo>
 
 </product>
diff --git a/SampleERCP/plugin.xml b/SampleERCP/plugin.xml
index 06832aae..a22663bd 100644
--- a/SampleERCP/plugin.xml
+++ b/SampleERCP/plugin.xml
@@ -11,7 +11,7 @@
             name="Simulator WIP">
          <property
                name="applicationCSS"
-               value="platform:/plugin/mograsim.rcp/css/default.css">
+               value="platform:/plugin/net.mograsim.rcp/css/default.css">
          </property>
          <property
                name="appName"
@@ -30,16 +30,16 @@
    <extension
          point="org.eclipse.ui.splashHandlers">
       <splashHandler
-            class="mograsim.rcp.splashhandlers.ExtensibleSplashHandler"
-            id="mograsim.rcp.splashHandlers.extensible">
+            class="net.mograsim.rcp.splashhandlers.ExtensibleSplashHandler"
+            id="net.mograsim.rcp.splashHandlers.extensible">
       </splashHandler>
       <splashHandlerProductBinding
-            productId="mograsim.rcp.product"
-            splashId="mograsim.rcp.splashHandlers.extensible">
+            productId="net.mograsim.rcp.product"
+            splashId="net.mograsim.rcp.splashHandlers.extensible">
       </splashHandlerProductBinding>
    </extension>
    <extension
-         point="mograsim.rcp.splashExtension">
+         point="net.mograsim.rcp.splashExtension">
       <splashExtension
             icon="icons/af.png"
             id="af"
diff --git a/SampleERCP/src/mograsim/rcp/handlers/AboutHandler.java b/SampleERCP/src/net/mograsim/rcp/handlers/AboutHandler.java
similarity index 88%
rename from SampleERCP/src/mograsim/rcp/handlers/AboutHandler.java
rename to SampleERCP/src/net/mograsim/rcp/handlers/AboutHandler.java
index ede71bd5..25a66638 100644
--- a/SampleERCP/src/mograsim/rcp/handlers/AboutHandler.java
+++ b/SampleERCP/src/net/mograsim/rcp/handlers/AboutHandler.java
@@ -1,4 +1,4 @@
-package mograsim.rcp.handlers;
+package net.mograsim.rcp.handlers;
 
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.jface.dialogs.MessageDialog;
diff --git a/SampleERCP/src/mograsim/rcp/handlers/OpenHandler.java b/SampleERCP/src/net/mograsim/rcp/handlers/OpenHandler.java
similarity index 88%
rename from SampleERCP/src/mograsim/rcp/handlers/OpenHandler.java
rename to SampleERCP/src/net/mograsim/rcp/handlers/OpenHandler.java
index f0ca44cd..7df311a4 100644
--- a/SampleERCP/src/mograsim/rcp/handlers/OpenHandler.java
+++ b/SampleERCP/src/net/mograsim/rcp/handlers/OpenHandler.java
@@ -1,4 +1,4 @@
-package mograsim.rcp.handlers;
+package net.mograsim.rcp.handlers;
 
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.swt.widgets.FileDialog;
diff --git a/SampleERCP/src/mograsim/rcp/handlers/QuitHandler.java b/SampleERCP/src/net/mograsim/rcp/handlers/QuitHandler.java
similarity index 91%
rename from SampleERCP/src/mograsim/rcp/handlers/QuitHandler.java
rename to SampleERCP/src/net/mograsim/rcp/handlers/QuitHandler.java
index 27e56ca2..c953e5a6 100644
--- a/SampleERCP/src/mograsim/rcp/handlers/QuitHandler.java
+++ b/SampleERCP/src/net/mograsim/rcp/handlers/QuitHandler.java
@@ -1,4 +1,4 @@
-package mograsim.rcp.handlers;
+package net.mograsim.rcp.handlers;
 
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.workbench.IWorkbench;
diff --git a/SampleERCP/src/mograsim/rcp/handlers/SaveHandler.java b/SampleERCP/src/net/mograsim/rcp/handlers/SaveHandler.java
similarity index 92%
rename from SampleERCP/src/mograsim/rcp/handlers/SaveHandler.java
rename to SampleERCP/src/net/mograsim/rcp/handlers/SaveHandler.java
index a3fd6be4..e662d6b8 100644
--- a/SampleERCP/src/mograsim/rcp/handlers/SaveHandler.java
+++ b/SampleERCP/src/net/mograsim/rcp/handlers/SaveHandler.java
@@ -1,4 +1,4 @@
-package mograsim.rcp.handlers;
+package net.mograsim.rcp.handlers;
 
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
diff --git a/SampleERCP/src/mograsim/rcp/parts/LogicUIPart.java b/SampleERCP/src/net/mograsim/rcp/parts/LogicUIPart.java
similarity index 76%
rename from SampleERCP/src/mograsim/rcp/parts/LogicUIPart.java
rename to SampleERCP/src/net/mograsim/rcp/parts/LogicUIPart.java
index 9f2a36ad..d23c9f45 100644
--- a/SampleERCP/src/mograsim/rcp/parts/LogicUIPart.java
+++ b/SampleERCP/src/net/mograsim/rcp/parts/LogicUIPart.java
@@ -1,4 +1,4 @@
-package mograsim.rcp.parts;
+package net.mograsim.rcp.parts;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -7,14 +7,14 @@ import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.ui.LogicExecuter;
-import mograsim.logic.ui.LogicUICanvas;
-import mograsim.logic.ui.examples.RSLatchExample;
-import mograsim.logic.ui.model.ViewModel;
-import mograsim.logic.ui.modeladapter.LogicModelParameters;
-import mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.logic.ui.LogicExecuter;
+import net.mograsim.logic.ui.LogicUICanvas;
+import net.mograsim.logic.ui.examples.RSLatchExample;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.modeladapter.LogicModelParameters;
+import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
 import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput;
+import net.mograsim.logic.core.timeline.Timeline;
 
 public class LogicUIPart
 {
diff --git a/SampleERCP/src/mograsim/rcp/parts/SamplePart.java b/SampleERCP/src/net/mograsim/rcp/parts/SamplePart.java
similarity index 97%
rename from SampleERCP/src/mograsim/rcp/parts/SamplePart.java
rename to SampleERCP/src/net/mograsim/rcp/parts/SamplePart.java
index f37ffb72..0bbe8aac 100644
--- a/SampleERCP/src/mograsim/rcp/parts/SamplePart.java
+++ b/SampleERCP/src/net/mograsim/rcp/parts/SamplePart.java
@@ -1,4 +1,4 @@
-package mograsim.rcp.parts;
+package net.mograsim.rcp.parts;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/SampleERCP/src/mograsim/rcp/splashhandlers/ExtensibleSplashHandler.java b/SampleERCP/src/net/mograsim/rcp/splashhandlers/ExtensibleSplashHandler.java
similarity index 99%
rename from SampleERCP/src/mograsim/rcp/splashhandlers/ExtensibleSplashHandler.java
rename to SampleERCP/src/net/mograsim/rcp/splashhandlers/ExtensibleSplashHandler.java
index d32258b2..17d4ea5e 100644
--- a/SampleERCP/src/mograsim/rcp/splashhandlers/ExtensibleSplashHandler.java
+++ b/SampleERCP/src/net/mograsim/rcp/splashhandlers/ExtensibleSplashHandler.java
@@ -1,4 +1,4 @@
-package mograsim.rcp.splashhandlers;
+package net.mograsim.rcp.splashhandlers;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/era.mi/.project b/era.mi/.project
index 39cad77d..783f7c7b 100644
--- a/era.mi/.project
+++ b/era.mi/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>mograsim.logic.core</name>
+	<name>net.mograsim.logic.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/era.mi/META-INF/MANIFEST.MF b/era.mi/META-INF/MANIFEST.MF
index fad3aa8a..655b5755 100644
--- a/era.mi/META-INF/MANIFEST.MF
+++ b/era.mi/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: mograsim.logic.core
-Bundle-SymbolicName: mograsim.logic.core
+Bundle-Name: net.mograsim.logic.core
+Bundle-SymbolicName: net.mograsim.logic.core
 Bundle-Version: 1.0.0.qualifier
-Export-Package: mograsim.logic.core,
- mograsim.logic.core.components,
- mograsim.logic.core.components.gates,
- mograsim.logic.core.tests,
- mograsim.logic.core.timeline,
- mograsim.logic.core.types,
- mograsim.logic.core.wires
+Export-Package: net.mograsim.logic.core,
+ net.mograsim.logic.core.components,
+ net.mograsim.logic.core.components.gates,
+ net.mograsim.logic.core.tests,
+ net.mograsim.logic.core.timeline,
+ net.mograsim.logic.core.types,
+ net.mograsim.logic.core.wires
 Bundle-RequiredExecutionEnvironment: JavaSE-10
-Automatic-Module-Name: mograsim.logic.core
+Automatic-Module-Name: net.mograsim.logic.core
diff --git a/era.mi/src/mograsim/logic/core/components/gates/AndGate.java b/era.mi/src/mograsim/logic/core/components/gates/AndGate.java
deleted file mode 100644
index 1f02a193..00000000
--- a/era.mi/src/mograsim/logic/core/components/gates/AndGate.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package mograsim.logic.core.components.gates;
-
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.BitVector.BitVectorMutator;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
-
-public class AndGate extends MultiInputGate
-{
-	public AndGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in)
-	{
-		super(timeline, processTime, BitVectorMutator::and, out, in);
-	}
-}
diff --git a/era.mi/src/mograsim/logic/core/components/gates/OrGate.java b/era.mi/src/mograsim/logic/core/components/gates/OrGate.java
deleted file mode 100644
index 69d64111..00000000
--- a/era.mi/src/mograsim/logic/core/components/gates/OrGate.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package mograsim.logic.core.components.gates;
-
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.BitVector.BitVectorMutator;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
-
-public class OrGate extends MultiInputGate
-{
-	public OrGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in)
-	{
-		super(timeline, processTime, BitVectorMutator::or, out, in);
-	}
-}
diff --git a/era.mi/src/mograsim/logic/core/wires/WireObserver.java b/era.mi/src/mograsim/logic/core/wires/WireObserver.java
deleted file mode 100644
index 2082bd34..00000000
--- a/era.mi/src/mograsim/logic/core/wires/WireObserver.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package mograsim.logic.core.wires;
-
-import mograsim.logic.core.types.BitVector;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-
-public interface WireObserver
-{
-	public void update(ReadEnd initiator, BitVector oldValues);
-}
diff --git a/era.mi/src/mograsim/logic/core/Util.java b/era.mi/src/net/mograsim/logic/core/Util.java
similarity index 97%
rename from era.mi/src/mograsim/logic/core/Util.java
rename to era.mi/src/net/mograsim/logic/core/Util.java
index 5f88e834..dd3671c2 100644
--- a/era.mi/src/mograsim/logic/core/Util.java
+++ b/era.mi/src/net/mograsim/logic/core/Util.java
@@ -1,8 +1,8 @@
-package mograsim.logic.core;
+package net.mograsim.logic.core;
 
 import java.util.Arrays;
 
-import mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.types.Bit;
 
 public final class Util
 {
diff --git a/era.mi/src/mograsim/logic/core/components/BasicComponent.java b/era.mi/src/net/mograsim/logic/core/components/BasicComponent.java
similarity index 74%
rename from era.mi/src/mograsim/logic/core/components/BasicComponent.java
rename to era.mi/src/net/mograsim/logic/core/components/BasicComponent.java
index 720c1259..426c6a11 100644
--- a/era.mi/src/mograsim/logic/core/components/BasicComponent.java
+++ b/era.mi/src/net/mograsim/logic/core/components/BasicComponent.java
@@ -1,9 +1,9 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.BitVector;
-import mograsim.logic.core.wires.WireObserver;
-import mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.logic.core.wires.WireObserver;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
 
 /**
  * A basic component that recomputes all outputs (with a delay), when it is updated.
diff --git a/era.mi/src/mograsim/logic/core/components/BitDisplay.java b/era.mi/src/net/mograsim/logic/core/components/BitDisplay.java
similarity index 70%
rename from era.mi/src/mograsim/logic/core/components/BitDisplay.java
rename to era.mi/src/net/mograsim/logic/core/components/BitDisplay.java
index 0d398dab..268d1572 100644
--- a/era.mi/src/mograsim/logic/core/components/BitDisplay.java
+++ b/era.mi/src/net/mograsim/logic/core/components/BitDisplay.java
@@ -1,12 +1,12 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.Bit;
-import mograsim.logic.core.types.BitVector;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public class BitDisplay extends BasicComponent
 {
diff --git a/era.mi/src/mograsim/logic/core/components/Clock.java b/era.mi/src/net/mograsim/logic/core/components/Clock.java
similarity index 68%
rename from era.mi/src/mograsim/logic/core/components/Clock.java
rename to era.mi/src/net/mograsim/logic/core/components/Clock.java
index 4b15ed38..65621358 100644
--- a/era.mi/src/mograsim/logic/core/components/Clock.java
+++ b/era.mi/src/net/mograsim/logic/core/components/Clock.java
@@ -1,14 +1,14 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.timeline.TimelineEvent;
-import mograsim.logic.core.timeline.TimelineEventHandler;
-import mograsim.logic.core.types.Bit;
-import mograsim.logic.core.wires.Wire;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.timeline.TimelineEvent;
+import net.mograsim.logic.core.timeline.TimelineEventHandler;
+import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.wires.Wire;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public class Clock extends Component implements TimelineEventHandler
 {
diff --git a/era.mi/src/mograsim/logic/core/components/Component.java b/era.mi/src/net/mograsim/logic/core/components/Component.java
similarity index 72%
rename from era.mi/src/mograsim/logic/core/components/Component.java
rename to era.mi/src/net/mograsim/logic/core/components/Component.java
index 54109df7..834f4b5b 100644
--- a/era.mi/src/mograsim/logic/core/components/Component.java
+++ b/era.mi/src/net/mograsim/logic/core/components/Component.java
@@ -1,10 +1,10 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public abstract class Component
 {
diff --git a/era.mi/src/mograsim/logic/core/components/Connector.java b/era.mi/src/net/mograsim/logic/core/components/Connector.java
similarity index 80%
rename from era.mi/src/mograsim/logic/core/components/Connector.java
rename to era.mi/src/net/mograsim/logic/core/components/Connector.java
index 0972cfad..16b8e709 100644
--- a/era.mi/src/mograsim/logic/core/components/Connector.java
+++ b/era.mi/src/net/mograsim/logic/core/components/Connector.java
@@ -1,12 +1,12 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.BitVector;
-import mograsim.logic.core.wires.WireObserver;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.logic.core.wires.WireObserver;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public class Connector extends Component implements WireObserver
 {
diff --git a/era.mi/src/mograsim/logic/core/components/Demux.java b/era.mi/src/net/mograsim/logic/core/components/Demux.java
similarity index 89%
rename from era.mi/src/mograsim/logic/core/components/Demux.java
rename to era.mi/src/net/mograsim/logic/core/components/Demux.java
index f1efb726..5da1bf6a 100644
--- a/era.mi/src/mograsim/logic/core/components/Demux.java
+++ b/era.mi/src/net/mograsim/logic/core/components/Demux.java
@@ -1,11 +1,11 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.wires.Wire;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.wires.Wire;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 /**
  * Models a multiplexer. Takes an arbitrary amount of input {@link Wire}s, one of which, as determined by select, is put through to the
diff --git a/era.mi/src/mograsim/logic/core/components/ManualSwitch.java b/era.mi/src/net/mograsim/logic/core/components/ManualSwitch.java
similarity index 80%
rename from era.mi/src/mograsim/logic/core/components/ManualSwitch.java
rename to era.mi/src/net/mograsim/logic/core/components/ManualSwitch.java
index 5012761e..fc6e9432 100644
--- a/era.mi/src/mograsim/logic/core/components/ManualSwitch.java
+++ b/era.mi/src/net/mograsim/logic/core/components/ManualSwitch.java
@@ -1,11 +1,11 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.Bit;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 /**
  * This class models a simple on/off (ONE/ZERO) switch for user interaction.
diff --git a/era.mi/src/mograsim/logic/core/components/Merger.java b/era.mi/src/net/mograsim/logic/core/components/Merger.java
similarity index 82%
rename from era.mi/src/mograsim/logic/core/components/Merger.java
rename to era.mi/src/net/mograsim/logic/core/components/Merger.java
index 114dbe7b..c4c71701 100644
--- a/era.mi/src/mograsim/logic/core/components/Merger.java
+++ b/era.mi/src/net/mograsim/logic/core/components/Merger.java
@@ -1,13 +1,13 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.BitVector;
-import mograsim.logic.core.wires.Wire;
-import mograsim.logic.core.wires.WireObserver;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.logic.core.wires.Wire;
+import net.mograsim.logic.core.wires.WireObserver;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public class Merger extends Component implements WireObserver
 {
diff --git a/era.mi/src/mograsim/logic/core/components/Mux.java b/era.mi/src/net/mograsim/logic/core/components/Mux.java
similarity index 90%
rename from era.mi/src/mograsim/logic/core/components/Mux.java
rename to era.mi/src/net/mograsim/logic/core/components/Mux.java
index 44c2a1d8..bbb10f5e 100644
--- a/era.mi/src/mograsim/logic/core/components/Mux.java
+++ b/era.mi/src/net/mograsim/logic/core/components/Mux.java
@@ -1,14 +1,14 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.wires.Wire;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.wires.Wire;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 /**
  * Models a multiplexer. Takes an arbitrary amount of input {@link Wire}s, one of which, as determined by select, is put through to the
diff --git a/era.mi/src/mograsim/logic/core/components/Splitter.java b/era.mi/src/net/mograsim/logic/core/components/Splitter.java
similarity index 79%
rename from era.mi/src/mograsim/logic/core/components/Splitter.java
rename to era.mi/src/net/mograsim/logic/core/components/Splitter.java
index 34749527..9eb5b2c0 100644
--- a/era.mi/src/mograsim/logic/core/components/Splitter.java
+++ b/era.mi/src/net/mograsim/logic/core/components/Splitter.java
@@ -1,12 +1,12 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.BitVector;
-import mograsim.logic.core.wires.WireObserver;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.logic.core.wires.WireObserver;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public class Splitter extends Component implements WireObserver
 {
diff --git a/era.mi/src/mograsim/logic/core/components/TriStateBuffer.java b/era.mi/src/net/mograsim/logic/core/components/TriStateBuffer.java
similarity index 80%
rename from era.mi/src/mograsim/logic/core/components/TriStateBuffer.java
rename to era.mi/src/net/mograsim/logic/core/components/TriStateBuffer.java
index b8ba0650..f4f1b491 100644
--- a/era.mi/src/mograsim/logic/core/components/TriStateBuffer.java
+++ b/era.mi/src/net/mograsim/logic/core/components/TriStateBuffer.java
@@ -1,11 +1,11 @@
-package mograsim.logic.core.components;
+package net.mograsim.logic.core.components;
 
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.Bit;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public class TriStateBuffer extends BasicComponent
 {
diff --git a/era.mi/src/net/mograsim/logic/core/components/gates/AndGate.java b/era.mi/src/net/mograsim/logic/core/components/gates/AndGate.java
new file mode 100644
index 00000000..fa1e94b6
--- /dev/null
+++ b/era.mi/src/net/mograsim/logic/core/components/gates/AndGate.java
@@ -0,0 +1,14 @@
+package net.mograsim.logic.core.components.gates;
+
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.BitVector.BitVectorMutator;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
+
+public class AndGate extends MultiInputGate
+{
+	public AndGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in)
+	{
+		super(timeline, processTime, BitVectorMutator::and, out, in);
+	}
+}
diff --git a/era.mi/src/mograsim/logic/core/components/gates/MultiInputGate.java b/era.mi/src/net/mograsim/logic/core/components/gates/MultiInputGate.java
similarity index 74%
rename from era.mi/src/mograsim/logic/core/components/gates/MultiInputGate.java
rename to era.mi/src/net/mograsim/logic/core/components/gates/MultiInputGate.java
index 40b10780..afc89511 100644
--- a/era.mi/src/mograsim/logic/core/components/gates/MultiInputGate.java
+++ b/era.mi/src/net/mograsim/logic/core/components/gates/MultiInputGate.java
@@ -1,13 +1,13 @@
-package mograsim.logic.core.components.gates;
+package net.mograsim.logic.core.components.gates;
 
 import java.util.List;
 
-import mograsim.logic.core.components.BasicComponent;
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.MutationOperation;
-import mograsim.logic.core.types.BitVector.BitVectorMutator;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.components.BasicComponent;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.MutationOperation;
+import net.mograsim.logic.core.types.BitVector.BitVectorMutator;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public abstract class MultiInputGate extends BasicComponent
 {
diff --git a/era.mi/src/mograsim/logic/core/components/gates/NotGate.java b/era.mi/src/net/mograsim/logic/core/components/gates/NotGate.java
similarity index 70%
rename from era.mi/src/mograsim/logic/core/components/gates/NotGate.java
rename to era.mi/src/net/mograsim/logic/core/components/gates/NotGate.java
index ebad7e3a..b1cfefee 100644
--- a/era.mi/src/mograsim/logic/core/components/gates/NotGate.java
+++ b/era.mi/src/net/mograsim/logic/core/components/gates/NotGate.java
@@ -1,11 +1,11 @@
-package mograsim.logic.core.components.gates;
+package net.mograsim.logic.core.components.gates;
 
 import java.util.List;
 
-import mograsim.logic.core.components.BasicComponent;
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.components.BasicComponent;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 public class NotGate extends BasicComponent
 {
diff --git a/era.mi/src/net/mograsim/logic/core/components/gates/OrGate.java b/era.mi/src/net/mograsim/logic/core/components/gates/OrGate.java
new file mode 100644
index 00000000..0072d506
--- /dev/null
+++ b/era.mi/src/net/mograsim/logic/core/components/gates/OrGate.java
@@ -0,0 +1,14 @@
+package net.mograsim.logic.core.components.gates;
+
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.BitVector.BitVectorMutator;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
+
+public class OrGate extends MultiInputGate
+{
+	public OrGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in)
+	{
+		super(timeline, processTime, BitVectorMutator::or, out, in);
+	}
+}
diff --git a/era.mi/src/mograsim/logic/core/components/gates/XorGate.java b/era.mi/src/net/mograsim/logic/core/components/gates/XorGate.java
similarity index 51%
rename from era.mi/src/mograsim/logic/core/components/gates/XorGate.java
rename to era.mi/src/net/mograsim/logic/core/components/gates/XorGate.java
index ea960364..15c24e27 100644
--- a/era.mi/src/mograsim/logic/core/components/gates/XorGate.java
+++ b/era.mi/src/net/mograsim/logic/core/components/gates/XorGate.java
@@ -1,9 +1,9 @@
-package mograsim.logic.core.components.gates;
+package net.mograsim.logic.core.components.gates;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.BitVector.BitVectorMutator;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.BitVector.BitVectorMutator;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 /**
  * Outputs 1 when the number of 1 inputs is odd.
diff --git a/era.mi/src/mograsim/logic/core/tests/ComponentTest.java b/era.mi/src/net/mograsim/logic/core/tests/ComponentTest.java
similarity index 93%
rename from era.mi/src/mograsim/logic/core/tests/ComponentTest.java
rename to era.mi/src/net/mograsim/logic/core/tests/ComponentTest.java
index c080d1a7..a47f7921 100644
--- a/era.mi/src/mograsim/logic/core/tests/ComponentTest.java
+++ b/era.mi/src/net/mograsim/logic/core/tests/ComponentTest.java
@@ -1,4 +1,4 @@
-package mograsim.logic.core.tests;
+package net.mograsim.logic.core.tests;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -9,22 +9,22 @@ import java.util.function.LongConsumer;
 
 import org.junit.jupiter.api.Test;
 
-import mograsim.logic.core.components.Connector;
-import mograsim.logic.core.components.Demux;
-import mograsim.logic.core.components.Merger;
-import mograsim.logic.core.components.Mux;
-import mograsim.logic.core.components.Splitter;
-import mograsim.logic.core.components.TriStateBuffer;
-import mograsim.logic.core.components.gates.AndGate;
-import mograsim.logic.core.components.gates.NotGate;
-import mograsim.logic.core.components.gates.OrGate;
-import mograsim.logic.core.components.gates.XorGate;
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.Bit;
-import mograsim.logic.core.types.BitVector;
-import mograsim.logic.core.wires.Wire;
-import mograsim.logic.core.wires.Wire.ReadEnd;
-import mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.components.Connector;
+import net.mograsim.logic.core.components.Demux;
+import net.mograsim.logic.core.components.Merger;
+import net.mograsim.logic.core.components.Mux;
+import net.mograsim.logic.core.components.Splitter;
+import net.mograsim.logic.core.components.TriStateBuffer;
+import net.mograsim.logic.core.components.gates.AndGate;
+import net.mograsim.logic.core.components.gates.NotGate;
+import net.mograsim.logic.core.components.gates.OrGate;
+import net.mograsim.logic.core.components.gates.XorGate;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.logic.core.wires.Wire;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
 class ComponentTest
 {
diff --git a/era.mi/src/mograsim/logic/core/tests/GUITest.java b/era.mi/src/net/mograsim/logic/core/tests/GUITest.java
similarity index 95%
rename from era.mi/src/mograsim/logic/core/tests/GUITest.java
rename to era.mi/src/net/mograsim/logic/core/tests/GUITest.java
index 0a0929c2..7d066219 100644
--- a/era.mi/src/mograsim/logic/core/tests/GUITest.java
+++ b/era.mi/src/net/mograsim/logic/core/tests/GUITest.java
@@ -1,4 +1,4 @@
-package mograsim.logic.core.tests;
+package net.mograsim.logic.core.tests;
 
 import java.awt.Color;
 import java.awt.Graphics;
@@ -15,12 +15,12 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.WindowConstants;
 
-import mograsim.logic.core.components.ManualSwitch;
-import mograsim.logic.core.components.gates.NotGate;
-import mograsim.logic.core.components.gates.OrGate;
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.timeline.Timeline.ExecutionResult;
-import mograsim.logic.core.wires.Wire;
+import net.mograsim.logic.core.components.ManualSwitch;
+import net.mograsim.logic.core.components.gates.NotGate;
+import net.mograsim.logic.core.components.gates.OrGate;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.timeline.Timeline.ExecutionResult;
+import net.mograsim.logic.core.wires.Wire;
 
 public class GUITest extends JPanel
 {
diff --git a/era.mi/src/mograsim/logic/core/tests/TestBitDisplay.java b/era.mi/src/net/mograsim/logic/core/tests/TestBitDisplay.java
similarity index 77%
rename from era.mi/src/mograsim/logic/core/tests/TestBitDisplay.java
rename to era.mi/src/net/mograsim/logic/core/tests/TestBitDisplay.java
index 80eef5fb..015e257f 100644
--- a/era.mi/src/mograsim/logic/core/tests/TestBitDisplay.java
+++ b/era.mi/src/net/mograsim/logic/core/tests/TestBitDisplay.java
@@ -1,13 +1,13 @@
-package mograsim.logic.core.tests;
+package net.mograsim.logic.core.tests;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 import java.util.function.LongConsumer;
 
-import mograsim.logic.core.components.BitDisplay;
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.Bit;
-import mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.components.BitDisplay;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
 
 public final class TestBitDisplay extends BitDisplay
 {
diff --git a/era.mi/src/mograsim/logic/core/timeline/Timeline.java b/era.mi/src/net/mograsim/logic/core/timeline/Timeline.java
similarity index 99%
rename from era.mi/src/mograsim/logic/core/timeline/Timeline.java
rename to era.mi/src/net/mograsim/logic/core/timeline/Timeline.java
index 1a380b41..fb639bed 100644
--- a/era.mi/src/mograsim/logic/core/timeline/Timeline.java
+++ b/era.mi/src/net/mograsim/logic/core/timeline/Timeline.java
@@ -1,4 +1,4 @@
-package mograsim.logic.core.timeline;
+package net.mograsim.logic.core.timeline;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/era.mi/src/mograsim/logic/core/timeline/TimelineEvent.java b/era.mi/src/net/mograsim/logic/core/timeline/TimelineEvent.java
similarity index 91%
rename from era.mi/src/mograsim/logic/core/timeline/TimelineEvent.java
rename to era.mi/src/net/mograsim/logic/core/timeline/TimelineEvent.java
index 6372bde8..c46e6ad6 100644
--- a/era.mi/src/mograsim/logic/core/timeline/TimelineEvent.java
+++ b/era.mi/src/net/mograsim/logic/core/timeline/TimelineEvent.java
@@ -1,4 +1,4 @@
-package mograsim.logic.core.timeline;
+package net.mograsim.logic.core.timeline;
 
 /**
  * A class that stores all relevant information about an event in the {@link Timeline}. Currently, there is not much relevant information to
diff --git a/era.mi/src/mograsim/logic/core/timeline/TimelineEventHandler.java b/era.mi/src/net/mograsim/logic/core/timeline/TimelineEventHandler.java
similarity index 69%
rename from era.mi/src/mograsim/logic/core/timeline/TimelineEventHandler.java
rename to era.mi/src/net/mograsim/logic/core/timeline/TimelineEventHandler.java
index dd58c0b3..badbabcb 100644
--- a/era.mi/src/mograsim/logic/core/timeline/TimelineEventHandler.java
+++ b/era.mi/src/net/mograsim/logic/core/timeline/TimelineEventHandler.java
@@ -1,4 +1,4 @@
-package mograsim.logic.core.timeline;
+package net.mograsim.logic.core.timeline;
 
 @FunctionalInterface
 public interface TimelineEventHandler
diff --git a/era.mi/src/mograsim/logic/core/types/Bit.java b/era.mi/src/net/mograsim/logic/core/types/Bit.java
similarity index 98%
rename from era.mi/src/mograsim/logic/core/types/Bit.java
rename to era.mi/src/net/mograsim/logic/core/types/Bit.java
index 60c4e192..fbfd0d56 100644
--- a/era.mi/src/mograsim/logic/core/types/Bit.java
+++ b/era.mi/src/net/mograsim/logic/core/types/Bit.java
@@ -1,4 +1,4 @@
-package mograsim.logic.core.types;
+package net.mograsim.logic.core.types;
 
 import java.util.Arrays;
 import java.util.Map;
diff --git a/era.mi/src/mograsim/logic/core/types/BitVector.java b/era.mi/src/net/mograsim/logic/core/types/BitVector.java
similarity index 99%
rename from era.mi/src/mograsim/logic/core/types/BitVector.java
rename to era.mi/src/net/mograsim/logic/core/types/BitVector.java
index 2d28b2ce..1e87f9a4 100644
--- a/era.mi/src/mograsim/logic/core/types/BitVector.java
+++ b/era.mi/src/net/mograsim/logic/core/types/BitVector.java
@@ -1,4 +1,4 @@
-package mograsim.logic.core.types;
+package net.mograsim.logic.core.types;
 
 import static java.lang.String.format;
 
diff --git a/era.mi/src/mograsim/logic/core/types/BitVectorFormatter.java b/era.mi/src/net/mograsim/logic/core/types/BitVectorFormatter.java
similarity index 89%
rename from era.mi/src/mograsim/logic/core/types/BitVectorFormatter.java
rename to era.mi/src/net/mograsim/logic/core/types/BitVectorFormatter.java
index 9a61c11a..a7985319 100644
--- a/era.mi/src/mograsim/logic/core/types/BitVectorFormatter.java
+++ b/era.mi/src/net/mograsim/logic/core/types/BitVectorFormatter.java
@@ -1,7 +1,7 @@
-package mograsim.logic.core.types;
+package net.mograsim.logic.core.types;
 
-import mograsim.logic.core.types.ColorDefinition.BuiltInColor;
-import mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.types.ColorDefinition.BuiltInColor;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
 
 public class BitVectorFormatter
 {
diff --git a/era.mi/src/mograsim/logic/core/types/ColorDefinition.java b/era.mi/src/net/mograsim/logic/core/types/ColorDefinition.java
similarity index 97%
rename from era.mi/src/mograsim/logic/core/types/ColorDefinition.java
rename to era.mi/src/net/mograsim/logic/core/types/ColorDefinition.java
index 7d69837a..28017362 100644
--- a/era.mi/src/mograsim/logic/core/types/ColorDefinition.java
+++ b/era.mi/src/net/mograsim/logic/core/types/ColorDefinition.java
@@ -1,4 +1,4 @@
-package mograsim.logic.core.types;
+package net.mograsim.logic.core.types;
 
 /**
  * A way to define a color with the possibility to use colors built into the system (called "system colors" in SWT).
diff --git a/era.mi/src/mograsim/logic/core/types/LogicType.java b/era.mi/src/net/mograsim/logic/core/types/LogicType.java
similarity index 98%
rename from era.mi/src/mograsim/logic/core/types/LogicType.java
rename to era.mi/src/net/mograsim/logic/core/types/LogicType.java
index b4e4efbc..39ae6816 100644
--- a/era.mi/src/mograsim/logic/core/types/LogicType.java
+++ b/era.mi/src/net/mograsim/logic/core/types/LogicType.java
@@ -1,4 +1,4 @@
-package mograsim.logic.core.types;
+package net.mograsim.logic.core.types;
 
 /**
  * Interface for types that support the basic logic operations
diff --git a/era.mi/src/mograsim/logic/core/types/MutationOperation.java b/era.mi/src/net/mograsim/logic/core/types/MutationOperation.java
similarity index 68%
rename from era.mi/src/mograsim/logic/core/types/MutationOperation.java
rename to era.mi/src/net/mograsim/logic/core/types/MutationOperation.java
index 998e5979..1fdae21c 100644
--- a/era.mi/src/mograsim/logic/core/types/MutationOperation.java
+++ b/era.mi/src/net/mograsim/logic/core/types/MutationOperation.java
@@ -1,8 +1,8 @@
-package mograsim.logic.core.types;
+package net.mograsim.logic.core.types;
 
 import java.util.function.BiFunction;
 
-import mograsim.logic.core.types.BitVector.BitVectorMutator;
+import net.mograsim.logic.core.types.BitVector.BitVectorMutator;
 
 @FunctionalInterface
 public interface MutationOperation extends BiFunction<BitVectorMutator, BitVector, BitVectorMutator>
diff --git a/era.mi/src/mograsim/logic/core/types/StrictLogicType.java b/era.mi/src/net/mograsim/logic/core/types/StrictLogicType.java
similarity index 90%
rename from era.mi/src/mograsim/logic/core/types/StrictLogicType.java
rename to era.mi/src/net/mograsim/logic/core/types/StrictLogicType.java
index 91cb10f2..c830b586 100644
--- a/era.mi/src/mograsim/logic/core/types/StrictLogicType.java
+++ b/era.mi/src/net/mograsim/logic/core/types/StrictLogicType.java
@@ -1,4 +1,4 @@
-package mograsim.logic.core.types;
+package net.mograsim.logic.core.types;
 
 /**
  * Interface for types that support the basic logic operations only among themselves, making it mathematically closed
diff --git a/era.mi/src/mograsim/logic/core/wires/Wire.java b/era.mi/src/net/mograsim/logic/core/wires/Wire.java
similarity index 96%
rename from era.mi/src/mograsim/logic/core/wires/Wire.java
rename to era.mi/src/net/mograsim/logic/core/wires/Wire.java
index 746e9269..d73ee61c 100644
--- a/era.mi/src/mograsim/logic/core/wires/Wire.java
+++ b/era.mi/src/net/mograsim/logic/core/wires/Wire.java
@@ -1,15 +1,15 @@
-package mograsim.logic.core.wires;
+package net.mograsim.logic.core.wires;
 
-import static mograsim.logic.core.types.Bit.U;
-import static mograsim.logic.core.types.Bit.Z;
+import static net.mograsim.logic.core.types.Bit.U;
+import static net.mograsim.logic.core.types.Bit.Z;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import mograsim.logic.core.timeline.Timeline;
-import mograsim.logic.core.types.Bit;
-import mograsim.logic.core.types.BitVector;
-import mograsim.logic.core.types.BitVector.BitVectorMutator;
+import net.mograsim.logic.core.timeline.Timeline;
+import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.logic.core.types.BitVector.BitVectorMutator;
 
 /**
  * Represents an array of wires that can store n bits of information.
diff --git a/era.mi/src/net/mograsim/logic/core/wires/WireObserver.java b/era.mi/src/net/mograsim/logic/core/wires/WireObserver.java
new file mode 100644
index 00000000..66914b48
--- /dev/null
+++ b/era.mi/src/net/mograsim/logic/core/wires/WireObserver.java
@@ -0,0 +1,9 @@
+package net.mograsim.logic.core.wires;
+
+import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.logic.core.wires.Wire.ReadEnd;
+
+public interface WireObserver
+{
+	public void update(ReadEnd initiator, BitVector oldValues);
+}
-- 
2.17.1