Spring cleaning (II)

- Some files were unnecessary, others renamed