Restructured module heirarchy.