12725 static file refactor