Complete architectural change - phase 1