some class and package names fixed
removed internal API