ReOrganize

Re organized. Again.