adding folder type; modifying output labels