Moving stuff around again
... and the error files too