Refactoring theme: move theme/architect contents to theme/