Rearrangements and adjustments

Everything works and nothing is broken.