Cleanup.

Renames dico method getFields + renamed and split files.