Still moving things around.
This still doesn't do much, but the structure is a bit more useful this way.