adjust directory, merge 'ds' to 'core'