Updating to ignore system files and cleaning up built in file names