Simplify modules dependencies