All s
All the renames
remove output
Merge branch 'combined' of https://github.com/uthcode/uthcode into combined