mod: restructure class