A lot of renaming
And now the shellcraft and docs work too