less files for classes plus bugfix