Re #62; split up options into smaller files
Re #62; split up types into smaller files