Split structs out into separate file; udate readme