update to latest purity and reorganise files etc.