added folder/file compatibility