Make some classes package private