Folder layout changes as per suggestion of /u/bs4h