Re-organize and cleanup the content.