Revisions to code hierarchy layout to make loading more elegant.