Refactor in static folder