changing structure

basic change in structure