changed structure

not done but commit