Re-arranging Class Structure For Clarity