partly updated to newest directory format