move some classes to own package to prevent name clash, fix bugs just introduced