* Aplit into types-augment * Adjust * Adjust, fix typegen run * Adjust * Rebuild * Adjust * Adjust * CC
* Move test files to correct packages * Adjust