Trying to re-organize structure a bit.