Moved highlighting files again to simplify testing