Major changes, most notably adding folder support