Rename classes
Pull key parsing logic out of loader
Tweak docs and visibility.
More renaming for clarity
Reformat
Fix a few inspections