diff --git a/src/agent/datapath_reducer.rs b/src/agent/datapath_reducer.rs
index cbd252eed..0d1144c1b 100644
--- a/src/agent/datapath_reducer.rs
+++ b/src/agent/datapath_reducer.rs
@@ -6,7 +6,7 @@ use crate::emulation_core::mips::datapath::{DatapathState, Stage};
 use crate::emulation_core::mips::fp_registers::FpRegisters;
 use crate::emulation_core::mips::gp_registers::GpRegisters;
 use crate::emulation_core::mips::memory::Memory;
-use crate::emulation_core::mips::stack::Stack;
+use crate::emulation_core::stack::Stack;
 use gloo_console::log;
 use std::rc::Rc;
 use yew::Reducible;
diff --git a/src/agent/messages.rs b/src/agent/messages.rs
index 1013baa2d..c40bd0b49 100644
--- a/src/agent/messages.rs
+++ b/src/agent/messages.rs
@@ -3,7 +3,7 @@ use crate::emulation_core::mips::datapath::DatapathState;
 use crate::emulation_core::mips::fp_registers::FpRegisters;
 use crate::emulation_core::mips::gp_registers::GpRegisters;
 use crate::emulation_core::mips::memory::Memory;
-use crate::emulation_core::mips::stack::Stack;
+use crate::emulation_core::stack::Stack;
 use crate::emulation_core::{architectures::AvailableDatapaths, mips::datapath::Stage};
 use serde::{Deserialize, Serialize};
 
diff --git a/src/emulation_core.rs b/src/emulation_core.rs
index ba1dedcb5..1ad19e59d 100644
--- a/src/emulation_core.rs
+++ b/src/emulation_core.rs
@@ -5,3 +5,4 @@ pub mod datapath;
 pub mod line_info;
 pub mod mips;
 pub mod riscv;
+pub mod stack;
diff --git a/src/emulation_core/mips.rs b/src/emulation_core/mips.rs
index bf26cd90d..0f309bd3f 100644
--- a/src/emulation_core/mips.rs
+++ b/src/emulation_core/mips.rs
@@ -9,5 +9,4 @@ pub mod datapath_signals;
 pub mod fp_registers;
 pub mod gp_registers;
 pub mod instruction;
-pub mod memory;
-pub mod stack;
+pub mod memory;
\ No newline at end of file
diff --git a/src/emulation_core/mips/datapath.rs b/src/emulation_core/mips/datapath.rs
index 547e4660f..c43c53fd8 100644
--- a/src/emulation_core/mips/datapath.rs
+++ b/src/emulation_core/mips/datapath.rs
@@ -57,7 +57,7 @@ use crate::emulation_core::architectures::DatapathRef;
 use crate::emulation_core::datapath::{DatapathUpdateSignal, Syscall};
 use crate::emulation_core::mips::fp_registers::FpRegisterType;
 use crate::emulation_core::mips::gp_registers::GpRegisterType::{A0, A1};
-use crate::emulation_core::mips::stack::{Stack, StackFrame};
+use crate::emulation_core::stack::{Stack, StackFrame};
 use serde::{Deserialize, Serialize};
 
 /// An implementation of a datapath for the MIPS64 ISA.
diff --git a/src/emulation_core/mips/stack.rs b/src/emulation_core/stack.rs
similarity index 100%
rename from src/emulation_core/mips/stack.rs
rename to src/emulation_core/stack.rs
diff --git a/src/ui/assembled_view/component.rs b/src/ui/assembled_view/component.rs
index 704e2b2fe..ac36bf287 100644
--- a/src/ui/assembled_view/component.rs
+++ b/src/ui/assembled_view/component.rs
@@ -6,7 +6,7 @@ use std::rc::Rc;
 
 use crate::agent::datapath_communicator::DatapathCommunicator;
 use crate::emulation_core::mips::memory::{Memory, MemoryIter};
-use crate::emulation_core::mips::stack::Stack;
+use crate::emulation_core::stack::Stack;
 // use monaco::api::TextModel;
 use crate::parser::parser_structs_and_enums::ProgramInfo;
 use crate::ui::swim_editor::tab::TabState;
diff --git a/src/ui/swim_editor/component.rs b/src/ui/swim_editor/component.rs
index 858f5054d..a17f9d47e 100644
--- a/src/ui/swim_editor/component.rs
+++ b/src/ui/swim_editor/component.rs
@@ -23,7 +23,7 @@ use yew_hooks::prelude::*;
 
 use crate::agent::datapath_reducer::DatapathReducer;
 use crate::emulation_core::mips::memory::Memory;
-use crate::emulation_core::mips::stack::Stack;
+use crate::emulation_core::stack::Stack;
 use crate::ui::assembled_view::component::{StackFrameView, StackSegment};
 use crate::{
     agent::datapath_communicator::DatapathCommunicator,