made some structure changes
some structure changes