More reasonable file names, more reasonable readme