Bewest/organize

Organize things so that it's easier to validate and compare against @jebeck's model.

Should also be easier to maintain from here on out as well.