Added new files and removed cruft.