Restructured pillar data
Added name to apache service
Bug fix