rename classes and package
some cleanup
constants