Move mkdict to new contrib location/fix package inclusion