Move core/data to duel/data
Cleanup
Cleanup
clean up.