defconfig: push to r47 & organize it.