Update default.xml

merged common files into device files.