Update: Reorganizing architecture