Reformatted and restructured everything