Assets moved to drawable. Some drawables renamed.
My largest merge