Now adding files and files from sub-directories