Revert "Architecture Changed"

This reverts commit 287b321196b056559e3aeb7b75ebb584973d4f07.
Architecture Changed