updated structure
some changes