renamed to follow class structure