Restructuring the Architecture