Extracted types from "god" files into separate file (one per type). fixes #2