Organization

Move a couple things around and introduce a few sections