Got Architecture refactored in a first pass