Package cleanup, small additions to resource interfaces.