First steps of re-architecture