Update lift-json dependency and move classes out of scala.* to awong.* so that a package object can be used w/o collision