Improve modules hierarchy.