Create, Activate, and Deactivate rules
Change the order of the sensors and the Scenes, creating Folders/Subfolders for them.
For example:
On Sensor page:
One folder for lights
Another Folder for thermostats
A 3rd Folder for Motion Detectors/Home security
Same thing for Scenes:
One folder for 1st floor or Atrium/Entry
Another folder for 2nd floor or Living Room
Another folder for 3rd floor or Bedroom
Etc.