EOD commit. Begin process of merging new data structures into SWB. Split old types module into a types and a constants_and_conversions module.