folder and class structure added