Moved the dictionaries and changed how they are loaded