Reorganize structure a bit