Updated file, should work with new file structures.