Reorganized a few items