Refactor files and update global config for Faye