merged some classes in single files