Many prices are now in tree.yml, not their own files.

Also a little re-ordering, so similar things are together.