Change sturct layout to simplify code