Simplify module heirarchy