Pull request for VincentB NEXEYA

Split the files to be more convenient to read