Added appdir & userdir handling in File etc