Summary: package and class renaming only; delete unused methods and classes
Reviewed-by: twisti