Folders Part II

I'm not sure why the diff shows the README changes as they've already been merged. Can you rebase this against master?