Restructured runs dir and links