Restore class structure, add folder. Remove extraneous method.