All the changes

(mostly cleaning up a messy folder)