Refactor class structure