fixed a couple RC1 bugs. simplified package hierarchy.