Fixed a few naming conventions
Architecture Overhaul
Base Architecture Changes