Removed many global dictionaries and adopted a convention-over-configuration approach

Supersede the old (pre-renaming) pull request