Reorganize

Filed into proper places and restructured for ease of access.