Removing subfolders.

Now that we have proofs, the distinction between Machine and Testing is more
fuzzy. I hope this won't disrupt others' workflow too much.