Corrections made to the files.
Compiler errors fixed on device class.
Compiler errors fixed.