Refactor codebase, no more architect