Update code to match the new version of Commons

Organize imports, remove the staticity in abstract DAO factory package.