Improve file structure and pull in Epel error pages