We are currently using the contracts root directory as a bin where we put everything that doesn't fit anywhere else. This is wrong, if we can't find a good place for a contract, it's likely that it shouldn't be in our repo.

We should move all the contracts that are directly in the contracts directory.