Switched to RA/DEC matching. Got rid of terrible directory structure