Cleanup.

Renames dico method getFields + renamed and split files.
Merge branch 'master' into gh-pages