restructuring

not defined yet