diff --git a/Intel8080/src/InputOutput.cpp b/Intel8080/src/InputOutput.cpp
deleted file mode 100644
index 9444434..0000000
--- a/Intel8080/src/InputOutput.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "stdafx.h"
-#include "InputOutput.h"
-
-EightBit::InputOutput::InputOutput() {
-}
-
-uint8_t EightBit::InputOutput::readInputPort(uint8_t port) {
- OnReadingPort(port);
- auto value = input[port];
- OnReadPort(port);
- return value;
-}
-
-void EightBit::InputOutput::writeOutputPort(uint8_t port, uint8_t value) {
- OnWritingPort(port);
- output[port] = value;
- OnWrittenPort(port);
-}
-
-void EightBit::InputOutput::OnReadingPort(uint8_t port) {
- ReadingPort.fire(PortEventArgs(port));
-}
-
-void EightBit::InputOutput::OnReadPort(uint8_t port) {
- ReadPort.fire(PortEventArgs(port));
-}
-
-void EightBit::InputOutput::OnWritingPort(uint8_t port) {
- WritingPort.fire(PortEventArgs(port));
-}
-
-void EightBit::InputOutput::OnWrittenPort(uint8_t port) {
- WrittenPort.fire(PortEventArgs(port));
-}
diff --git a/Intel8080/src/Intel8080.vcxproj b/Intel8080/src/Intel8080.vcxproj
index 7c69427..c826775 100644
--- a/Intel8080/src/Intel8080.vcxproj
+++ b/Intel8080/src/Intel8080.vcxproj
@@ -140,15 +140,12 @@
-
-
-
diff --git a/Intel8080/src/Intel8080.vcxproj.filters b/Intel8080/src/Intel8080.vcxproj.filters
index 567a441..6a3e887 100644
--- a/Intel8080/src/Intel8080.vcxproj.filters
+++ b/Intel8080/src/Intel8080.vcxproj.filters
@@ -17,15 +17,9 @@
Header Files
-
- Header Files
-
Header Files
-
- Header Files
-
Header Files
@@ -37,9 +31,6 @@
Source Files
-
- Source Files
-
Source Files
diff --git a/Z80/inc/InputOutput.h b/Z80/inc/InputOutput.h
deleted file mode 100644
index c51eda6..0000000
--- a/Z80/inc/InputOutput.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include
-#include "Signal.h"
-#include "PortEventArgs.h"
-
-namespace EightBit {
- class InputOutput {
- public:
- InputOutput();
-
- uint8_t read(uint8_t port) { return readInputPort(port); }
- void write(uint8_t port, uint8_t value) { return writeOutputPort(port, value); }
-
- uint8_t readInputPort(uint8_t port);
- void writeInputPort(uint8_t port, uint8_t value) { input[port] = value; }
-
- uint8_t readOutputPort(uint8_t port) { return output[port]; }
- void writeOutputPort(uint8_t port, uint8_t value);
-
- Signal ReadingPort;
- Signal ReadPort;
-
- Signal WritingPort;
- Signal WrittenPort;
-
- protected:
- void OnReadingPort(uint8_t port);
- void OnReadPort(uint8_t port);
-
- void OnWritingPort(uint8_t port);
- void OnWrittenPort(uint8_t port);
-
- private:
- std::array input;
- std::array output;
- };
-}
\ No newline at end of file
diff --git a/Z80/inc/PortEventArgs.h b/Z80/inc/PortEventArgs.h
deleted file mode 100644
index 3455770..0000000
--- a/Z80/inc/PortEventArgs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include
-
-namespace EightBit {
- class PortEventArgs {
- public:
- PortEventArgs(uint8_t port)
- : m_port(port) {}
-
- uint8_t getPort() const {
- return m_port;
- }
-
- private:
- uint8_t m_port;
- };
-}
\ No newline at end of file
diff --git a/Z80/src/Z80.vcxproj b/Z80/src/Z80.vcxproj
index 3fb7c70..b45fb61 100644
--- a/Z80/src/Z80.vcxproj
+++ b/Z80/src/Z80.vcxproj
@@ -139,15 +139,12 @@
-
-
-
Create
diff --git a/Z80/src/Z80.vcxproj.filters b/Z80/src/Z80.vcxproj.filters
index b57fa53..d4b0a4e 100644
--- a/Z80/src/Z80.vcxproj.filters
+++ b/Z80/src/Z80.vcxproj.filters
@@ -17,12 +17,6 @@
Header Files
-
- Header Files
-
-
- Header Files
-
Header Files
@@ -37,9 +31,6 @@
Source Files
-
- Source Files
-
Source Files
diff --git a/Intel8080/inc/InputOutput.h b/inc/InputOutput.h
similarity index 100%
rename from Intel8080/inc/InputOutput.h
rename to inc/InputOutput.h
diff --git a/Intel8080/inc/PortEventArgs.h b/inc/PortEventArgs.h
similarity index 100%
rename from Intel8080/inc/PortEventArgs.h
rename to inc/PortEventArgs.h
diff --git a/src/EightBit.vcxproj b/src/EightBit.vcxproj
index 2532ba8..5c212fd 100644
--- a/src/EightBit.vcxproj
+++ b/src/EightBit.vcxproj
@@ -140,8 +140,10 @@
+
+
@@ -149,6 +151,7 @@
+
diff --git a/src/EightBit.vcxproj.filters b/src/EightBit.vcxproj.filters
index 57c17c6..f123331 100644
--- a/src/EightBit.vcxproj.filters
+++ b/src/EightBit.vcxproj.filters
@@ -35,6 +35,12 @@
Header Files
+
+ Header Files
+
+
+ Header Files
+
@@ -52,5 +58,8 @@
Source Files
+
+ Source Files
+
\ No newline at end of file
diff --git a/Z80/src/InputOutput.cpp b/src/InputOutput.cpp
similarity index 100%
rename from Z80/src/InputOutput.cpp
rename to src/InputOutput.cpp