Renaming/moving resources.
Fixing unit tests.