Uses File.join to build filename
Removes newline in README
Removes messy _s from folder names