add new files for D3, rename some old ones