Re-organize and rename class