Remove "functions" and "helpers" layers, fix references to messageListHelper