Rename class; move some functionality into separate file