update code structure
test