Archi. reorganization