Moved some things around

Still trying to get a feel for what this will look like in the end while
reading through the rulebook.