cleaned up code, changed to 'all files in folder' system