To put it broadly, yes... though you could also add in the enchanted items who use the energy stored within to actually complete some sort of function or spell, and those that simply store it only...

[Things could be split in a number of ways, but perhaps those two categories ought to be three... After all, there were items that could be used even by people with no magic to certain effects...]