Architecture reorganization