What a nightmare!
First things first. I made a logical diagram of the various vlan connections, and documented any special ports that were in use. Then the fun began. All cables were disconnected.
Then we reorganized the racks so that all the switches were on one side, and all the patch panels on the other.
Then we did a logical reorganization of the switches, so that all the servers and routers ports were on the same non-poe switches, and all the workstations would connecting to the poe ones.
After that, it was just a matter of cabling things up – neatly!
Et Voila! From chaos to order.