[Updated] Do a better separation in config package