restructured
Merge http://github.com/mkevinr/flaming-piniata