Adding folder support back in at the request of Dan Howe.