Reorganize packages, add a few new methods.