Start supporting folders
Fix incorrect output
Look for files in the right place