Split up extra-config_devd and extra-devd into single files.