DictWindow is now again in separate file
DictWindow is now again in separate file