Made some classes package proteced.