Move TypeVariable to it's own module