Made classes package-protected where applicable