upgrade to centos7 and re-organise files