Refactor folder name and added animation