Clean up public module hierarchy.