Re-organizing by product for easier management.