Updated as per live files and folders