Some refactoring, make assets more local.