Restructure things a little to get the hierarchy stuff more logical.