Reorganization for easier use