I am tempted to suggest waiting. In fact, I would suggest that instead of the reorganization we actually consider reallocating devices based on the number of entries. Any categories with less than 8 entries would only get # of entries/2 devices. Any "unused" devices would be reallocated to the categories with the most entries. Just my 2ct