renamed classes and packages.  Doesn't build as of now.