Start from scratch again - no more helper tools
modifying version info
imports
merging old working copy for new rework to be done...
make inner classes independent