Moved around files into new structure
Fixed buf with SGText and clearing the text
Updated test application to remove the old code