move device and sorting classes and subclasses to proper folders