Design fixes. Deleted a whole bunch of unnecessary files.