Move to using a unified static folder