Made changes to pickup the files from a general directory instead of looking for "data" directory