Moving a whole bunch of things around. In addition, have
fixed a couple of skymaker problems, and also fixed some
moving origin things.