Fix some traces, and move images to a more proper folder