moved package-local classes into _private package
removed unused class