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

no functional changes