Cleaned up packages and references.