Consolidate function files
Consolidate function files