restructuring quite much. this is the first phase.