Made up some device sub-types
Merge pull request #15 from Meisaka/generic-devices

Made up some device sub-types