I've gone through and renamed files in Git. I've also rm'd the extra files. The renames will probably break builds on Mono, but I don't have the head of Mono built. I'll push today's changes tomorrow. JD