some clean-up and move of classes
Merge branch 'master' of git@github.com:xwic/jWic.git