Initial toolset
Renaming
Update readme, simpler names