Added config loading and merging from directory