More package restructure. Because I can.
Some comments.
Some more test ideas and comments.