Reorder module and fix version