Package changes, OreDic support, preparation