Working dir & filename changes