Dictionary files merged for easier development

(Auto reloading now works)