simplify exception handling
rename devices directory to device