Remove the fish, re-arrange the rock work. By doing this your taking away established territorries and making them find new ones, and leave the light out for a couple of days. Everything will settle down after while. I always introduce fish into a dark tank, helps the "new guy" settle in a bit and usually within the next day or two he's found his place in the tank and you can turn the light back on.
