Added TextBlock

Also moved around some names