organizing some structure stuff