Problem 3: Moved stuff into default package for consistency.