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

Superced the old (pre-renaming) pull request