Fixed rename resource bug
Resource repository and builder refactoring
Merge
Fixed user test
Submodule update