Organizing again.

Still learning, I hope I didn't make a mess of this.