Add Device package and renamed class files