Chore initial architecture