third commit

restructerring