move Willy helpers into single file, remove redundant file-helper method