Assets rework and cleanup
Submodule updates