Public assets refactoring