[NUCGUAVA-8] Simplify the package structure to
org.datanucleus.store.types.guava based