Re-organized project folder

Hopefully this doesn't thrash commit history too badly, but it had to
happen eventually.