Change dictionary location
Move module location
Refactor main