rename/refactor main class