Moving deprecated files, cleaning up