refactoring
moved all classes to new package
add tools package
code cleanups