Reorganize, clean up LR87 files