fixed beta 6 warnings
separate files for each class