added some stucture.
fixup! added some stucture.