Changed files with adaptor in name to formatter.
Changed path and function names.
Merge branch `adaptor` into `master`.