changed structure

changed structure