Solved the assets problem

Some files have been renamed, hope that the diff will be easy to read.