improved file folder/name output