Implement changes in #111.
Move field defs to separate file
Remove all rank types but exact and percentile