Rename, moving assets, bug fixing