scala class put into right name in right package + several little enhancements
Merge pull request #244 from yanns/mini-fixes

scala class put into right name in right package + several little enhancements