Patch 3

group all config in the same file