Restructuring and architecture changes