Move textual abbreviations import to top
Add distinct types for file and rank. Closes #3