My version of files for next iteration of XDE package