Restructure to remove pointless nesting

There was no reason to keep instances under their parent type.