Moved device files into subdirectory