Moved dictionaries out into their own modules