More architecture change

With the teacher as a guide, indeed.