Moved some stuff around.

...even if the only difference is a comment? Wut?