Fix modules orders for importing