class rename
code restructuring
new class