Moved things around, updated README.