restructuring, moving toward real architecture