Added folder support, Added internal file support