Anishek/Ashwin | renaming folders properly