Modified to use new static folder structure