Updated readme, folder names