Revert "Architecture Layout (only base, needs work)"

This reverts commit 451f65dc3d761c25e0cdbb624e8ddaa9f06e1325.
Architecture Layout (FIX PLEASE)