Restructure data objects

Based on my work in my 7 Wonders data mashing gist:
https://gist.github.com/jugglingnutcase/9992169