Split module parsing and types out better

Split module parsing and types out better #600