rafactore Folder and add new class

rafactore Folder and add new class