Rmoved device folder level. Software folder titles identify device.