Common 7 and 8

Added functionality for subdirs and trees.