Reorganized the packaging. Optimized imports. No code changes except needed visibility changes.
Fixed warnings that were reported by lint.