diff --git a/.gitignore b/.gitignore index 0fbe0bcd81..1b6052fea7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ +# extra files created to hold the versioning information +validphys2/src/validphys/_version.py + # extra files created by cmake libnnpdf/nnprofile.yaml +libnnpdf/REAMDE.md libnnpdf/scripts/nnpdf.pc libnnpdf/src/NNPDF/common.h libnnpdf/src/NNPDF/config.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f04bd55248..663b5892f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,9 +40,7 @@ option(ENABLE_OPENMPI "Enable openMPI parallelism." OFF) option(ENABLE_TESTS "Enable unit test" OFF) option(ENABLE_ASAN "Enable ASAN" OFF) option(ENABLE_DEAD_STRIP "Enable use of flag `-dead_strip-dylibs`" OFF) -option(VP_DEV "validphys in developer mode" ON) -option(N3_DEV "n3fit in developer mode" ON) -option(BURN_TAG "burn down the git tag in vp and n3fit (only local non-dev installation)" ON) +option(NNPDF_DEV "n3fit and validphys in developer mode" ON) set(PROFILE_PREFIX "" CACHE STRING "Where you store the 'data' folder. Default empty uses CMAKE_INSTALL_PREFIX/share/NNPDF.") if (PROFILE_PREFIX) @@ -148,54 +146,8 @@ add_subdirectory(nnpdfcpp) # evolven3fit add_subdirectory(n3fit/evolven3fit) -if((BURN_TAG) AND (NOT (VP_DEV) OR NOT (N3_DEV))) - # Find out where is the root of the git repository (if available) and finds the correct tag to burn down - # in the package. This just sets the variable, the actual burning is done down below by the validphys - # or n3fit installation and is found in the version.cmake file as it needs to be done post-installation - set(GIT_DIR "--git-dir=${PROJECT_SOURCE_DIR}/.git") - # get the current tag (ex: 3.4) and check at the same time whether git is available and the .git folder found - execute_process(COMMAND git ${GIT_DIR} describe --abbrev=0 --tags OUTPUT_VARIABLE GIT_TAG ERROR_VARIABLE GIT_ERROR) - if(GIT_ERROR STREQUAL "") - string(STRIP ${GIT_TAG} GIT_TAG) - # get the number of revisions since tag happened - execute_process(COMMAND git ${GIT_DIR} rev-list ${GIT_TAG}..HEAD --count OUTPUT_VARIABLE GIT_REVN) - string(STRIP ${GIT_REVN} GIT_REVN) - # get the shortname for the hash - execute_process(COMMAND git ${GIT_DIR} rev-parse --short HEAD OUTPUT_VARIABLE GIT_HASH) - string(STRIP ${GIT_HASH} GIT_HASH) - # find out whether the repository is in a dirty state - # (this returns ${GIT_TAG}-dev so we have to remove the tag) - execute_process(COMMAND git ${GIT_DIR} describe --abbrev=0 --tags --dirty=-dev OUTPUT_VARIABLE GIT_DIRTY) - string(STRIP ${GIT_DIRTY} GIT_DIRTY) - string(REPLACE "${GIT_TAG}" "" GIT_DIRTY ${GIT_DIRTY}) - # now concatenate everything - # with the format ex: 3.4.1880+g00b1741c-dev - set(GIT_VERSION "build_version='${GIT_TAG}.${GIT_REVN}+g${GIT_HASH}${GIT_DIRTY}'") - # now set the variable at install time - install(CODE "set(GIT_VERSION \"${GIT_VERSION}\")") - else(GIT_ERROR STREQUAL "") - set(BURN_TAG OFF) - endif(GIT_ERROR STREQUAL "") -endif() - -# install validphys2 -if(VP_DEV) - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install -e ${PROJECT_SOURCE_DIR}/validphys2)") -else(VP_DEV) - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps --ignore-installed ${PROJECT_SOURCE_DIR}/validphys2)") - if(BURN_TAG) - install(CODE "set(LIBRARY \"validphys\")") - install(SCRIPT ${PROJECT_SOURCE_DIR}/version.cmake) - endif(BURN_TAG) -endif(VP_DEV) - -# install n3fit -if(N3_DEV) - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install -e ${PROJECT_SOURCE_DIR}/n3fit)") -else(N3_DEV) - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps --ignore-installed ${PROJECT_SOURCE_DIR}/n3fit)") - if(BURN_TAG) - install(CODE "set(LIBRARY \"n3fit\")") - install(SCRIPT ${PROJECT_SOURCE_DIR}/version.cmake) - endif(BURN_TAG) -endif(N3_DEV) +if(NNPDF_DEV) + install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps -e ${PROJECT_SOURCE_DIR})") +else(NNPDF_DEV) + install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --no-deps --ignore-installed ${PROJECT_SOURCE_DIR})") +endif(NNPDF_DEV) diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index 28965fa171..a8f21fde68 100644 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -2,9 +2,6 @@ mkdir build cd build -echo "build_version=\"${PKG_VERSION}\"" > ../n3fit/src/n3fit/version.py -echo "build_version=\"${PKG_VERSION}\"" > ../validphys2/src/validphys/version.py - -cmake .. -DCMAKE_INSTALL_PREFIX=${PREFIX} -DVP_DEV=OFF -DN3_DEV=OFF -DBURN_TAG=OFF +cmake .. -DCMAKE_INSTALL_PREFIX=${PREFIX} -DNNPDF_DEV=OFF make -j${CPU_COUNT} make install diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 60cd770671..c3e0fe5804 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -23,6 +23,8 @@ requirements: - apfel >=3 # see https://github.com/scarrazza/apfel - python - numpy + - poetry-core >=1.0.0 + - poetry-dynamic-versioning >=1.1.0 run: - tensorflow >=2.10 - tensorflow >=2.10 *eigen* # [py < 311] diff --git a/doc/sphinx/source/data/data-config.rst b/doc/sphinx/source/data/data-config.rst index 97d8de880e..86c6d65539 100644 --- a/doc/sphinx/source/data/data-config.rst +++ b/doc/sphinx/source/data/data-config.rst @@ -4,22 +4,22 @@ Organisation of data files ========================== -The ``nnpdf++`` code needs to be able to handle a great deal of different +The ``nnpdf`` code needs to be able to handle a great deal of different options with regard to the treatment of both experimental data and theoretical choices. In the code, every effort has been made to keep experimental and theoretical parameters strictly separate. -In this section we shall specify the layout of the various ``nnpdf++`` data +In this section we shall specify the layout of the ``nnpdf`` data directory. It is in this directory that all of the read-only data to be used in -the fit are accessed. The data directory is located in the ``nnpdfcpp`` git -repository, under the path ``/nnpdfcpp/data/``. +the fit are accessed. The data directory is located in the ``nnpdf`` git +repository, under the path ``validphys/src/validphys2/datafiles``. Experimental data storage ========================= -The central repository for ``CommonData`` in use by ``nnpdf++`` projects is -located in the ``nnpdfcpp`` git repository at +The central repository for ``CommonData`` in use by ``nnpdf`` projects is +located in the ``nnpdf`` git repository at - ``/nnpdfcpp/data/commondata/`` + ``validphys/src/validphys2/datafiles/commondata`` where a separate ``CommonData`` file is stored for each *Dataset* with the filename format @@ -29,7 +29,7 @@ filename format Information on the treatment of systematic uncertainties, provided in ``SYSTYPE`` files, is located in the subdirectory - ``/nnpdfcpp/data/commondata/systypes`` + ``commondata/systypes`` Here several ``SYSTYPE`` files may be supplied for each *Dataset*. The various options are enumerated by suffix to the filename. The filename format @@ -47,16 +47,16 @@ Theory lookup table In order to organise the various different theoretical treatments available, a lookup table is provided in ``sqlite3`` format. This lookup table can be found -in the ``nnpdfcpp`` repository data directory at: +in the ``nnpdf`` repository data directory at: - ``/nnpdfcpp/data/theory.db`` + ``validphys/src/validphys2/datafiles/theory.db`` This file should only be edited in order to add new theory options. It may be edited with any appropriate ``sqlite3``-supported software. A script is provided to give a brief overview of the various theory options available. It can be found at - ``/nnpdfcpp/data/disp_theory.py`` + ``validphys/src/validphys2/datafiles/disp_theory.py`` and should be run without any arguments. diff --git a/doc/sphinx/source/theory/theoryparamsinfo.md b/doc/sphinx/source/theory/theoryparamsinfo.md index bd2d063826..162dd99cc7 100644 --- a/doc/sphinx/source/theory/theoryparamsinfo.md +++ b/doc/sphinx/source/theory/theoryparamsinfo.md @@ -3,9 +3,9 @@ ``` # Looking up the parameters of a theory -The parameters for all of the theories can be found in the `theory.db` file, -located in the `/share/NNPDF/data` directory. This is an -sqlite database file. The information contained within this file can also be +The parameters for all of the theories can be found in the `theory.db` file. +The `theory.db` file is installed together as part of the validphys package. +This is an sqlite database file. The information contained within this file can also be viewed [within the docs](theory-indexes). The tools required to extract the parameters for a given theory are already in diff --git a/doc/sphinx/source/vp/nnprofile.md b/doc/sphinx/source/vp/nnprofile.md index 6a4806feb1..10bfde066d 100644 --- a/doc/sphinx/source/vp/nnprofile.md +++ b/doc/sphinx/source/vp/nnprofile.md @@ -5,30 +5,28 @@ The `nnprofile.yaml` file ========================= -The NNPDF code (both `libnnpdf` and `validphys`) stores some configuration -options (mostly various URLs and paths) in an `nnprofile.yaml` file, which is -installed with the code. +The NNPDF code stores some configuration options (mostly various URLs and paths) in a `.yaml` file +which is installed alongside the code. +The default values can be consulted in ``validphys/default_nnprofile.yaml``. -In particular this configuration is used by `validphys` to locate, +This configuration is used by `validphys` to locate, [upload](upload) and [download](download) resources. Altering profile settings -------------------------- -The default settings are computed based on the install prefix, from the input -file `libnnpdf/nnprofile.yaml.in`. Changes with the intention to affect all uses -(such as adding a new repository for PDF sets) should be made there. - -The default location of the profile file is computed at install time as -`$(INSTALL_PREFIX)/share/NNPDF/nnprofile.yaml`. The default profile is written -in that location and the code loads it from there. Users should not override -that installed file since changes to it will be lost the next time the code is -installed. However it is possible to alter the profile search location locally -by defining the environment variable ``NNPDF_PROFILE_PATH`` to point to a -different profile file, which will be loaded instead by the code. Specifying a -custom profile could be useful to add repositories for specific projects or +It is possible to set up a custom profile file in: +``` + ${XDG_CONFIG_HOME}/NNPDF/nnprofile.yaml +``` +such that it will be used by every NNPDF installation (note that `${XDG_CONFIG_HOME}` defaults to `~/.config`) +or by defining the environment variable ``NNPDF_PROFILE_PATH`` to point to a +different profile file, which will be loaded instead by the code. +Specifying a custom profile could be useful to add repositories for specific projects or change the paths based on the local filesystem characteristics. +If a custom profile is used, the values defined there will take precedence over the default values defined by NNPDF. + Options ------- @@ -37,13 +35,22 @@ the code. These should be specified in YAML format. ```eval_rst -``data_path`` - The path in the user's system where input data such as CommonData files and - FKtables are to be found, and stored when :ref:`downloaded `. +``nnpdf_share``` + Main folder for NNPDF shared resources: theories, fits, hyperscans, etc. + Ex: ``nnpdf_share: ~/.local/share/NNPDF``. + All other paths are defined relative to ``nnpdf_share``. + It is possible to set the special key ``RELATIVE_TO_PYTHON``, in this case the code + will use as share folder the share folder of the current environment (for instance ``${CONDA_PREFIX}/share/NNPDF``). + +``theories_path`` + The path in the user's system where the theory files (FKtables and ekos) + are to be found, and stored when :ref:`downloaded `. + Defaults to ``nnpdf_share/theories``. ``results_path`` A path where completed fits are to be retrieved from, and stored when :ref:`downloaded `. + Defaults to ``nnpdf_share/results``. ``validphys_cache_path`` A path where to store downloaded validphys resources. diff --git a/doc/sphinx/source/vp/scripts.rst b/doc/sphinx/source/vp/scripts.rst index 6e9c91fc52..a35e636b82 100644 --- a/doc/sphinx/source/vp/scripts.rst +++ b/doc/sphinx/source/vp/scripts.rst @@ -116,9 +116,10 @@ Will result in a fit named :code:`181109-si-nlo-central_DISonly` and a copy name in the original directory. However, by default, fits that are download with :code:`vp-get fit` will be located in the NNPDF -results directory. This is usually located in -:code:`~/miniconda3/envs//share/NNPDF/results`. Fits located in this directory can be -renamed with the :code:`-r` flag. +results directory. +The results directory is defined by the ``results_path`` key in the ``nnprofile.yaml`` configuration file +(usually located in ``~/.config/NNPDF/nnprofile.yaml``). +Fits located in this directory can be renamed with the :code:`-r` flag. As an example, suppose the fit :code:`181109-si-nlo-central_DISonly` is located in the NNPDF results directory. It can be renamed, irrespective of the current working directory, using diff --git a/libnnpdf/CMakeLists.txt b/libnnpdf/CMakeLists.txt index 27200b82bd..0147d12f26 100644 --- a/libnnpdf/CMakeLists.txt +++ b/libnnpdf/CMakeLists.txt @@ -58,6 +58,9 @@ target_link_libraries(nnpdf ${LHAPDF_LIBRARIES} ${GSL_LDFLAGS} ${SQLITE3_LDFLAGS install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/scripts/nnpdf.pc DESTINATION lib/pkgconfig) install(DIRECTORY src/NNPDF DESTINATION include) + +file(WRITE ${PROJECT_SOURCE_DIR}/libnnpdf/REAMDE.md "The share folder of NNPDF has been moved, see: https://github.com/NNPDF/nnpdf/pull/1861\n") +install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/REAMDE.md DESTINATION share/NNPDF) install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/nnprofile.yaml DESTINATION share/NNPDF) install(TARGETS nnpdf DESTINATION lib) diff --git a/libnnpdf/README.md b/libnnpdf/README.md deleted file mode 100644 index 610a2c2d88..0000000000 --- a/libnnpdf/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# libnnpdf -Library for core NNPDF utilities. - -## Project summary and aim - -The aim of `libnnpdf` is to provide a set of common tools shared between multiple -projects for the NNPDF Collaboration. The output of this repository is a C++ library -which can be imported and shared to other native C++ programs and python codes through -the SWIG wrapper. - -The library implements the following principle components: -- Data I/O -- PDF parametrisation -- FK tables parser -- Theoretical prediction convolutions -- PDF set handling - -### Testing - -Basic testing is implemented through two interfaces: -- c++ using catch: it tests c++ specific features, like copy constructors memory allocation, etc. -- swig+vp2 using pytests: it tests the python wrapper, provides utilities to dump results to disk and use a reference in future tests. diff --git a/n3fit/evolven3fit/CMakeLists.txt b/n3fit/evolven3fit/CMakeLists.txt index 417de24e7c..5a59287a15 100644 --- a/n3fit/evolven3fit/CMakeLists.txt +++ b/n3fit/evolven3fit/CMakeLists.txt @@ -26,4 +26,3 @@ target_link_libraries(evolven3fit nnpdf ${YAML_LDFLAGS} ${APFEL_LIBRARIES} ${GSL install(TARGETS evolven3fit DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - diff --git a/n3fit/setup.py b/n3fit/setup.py deleted file mode 100644 index e81c54809b..0000000000 --- a/n3fit/setup.py +++ /dev/null @@ -1,21 +0,0 @@ -from setuptools import setup, find_packages - -setup( - name="n3fit", - version="4.0", - package_dir = {'':'src'}, - packages=find_packages('src'), - zip_safe=False, - package_data = { - '':['*.json', '*.yml', '*.h5'], - 'tests/regressions': ['*'], - }, - - entry_points = {'console_scripts': - ['n3fit = n3fit.scripts.n3fit_exec:main', - 'evolven3fit_new = n3fit.scripts.evolven3fit_new:main', - 'vp-setupfit = n3fit.scripts.vp_setupfit:main', - 'varflavors = n3fit.scripts.varflavors:main', - ] - }, -) diff --git a/n3fit/src/evolven3fit_new/__init__.py b/n3fit/src/evolven3fit_new/__init__.py index e69de29bb2..7346cacc8b 100644 --- a/n3fit/src/evolven3fit_new/__init__.py +++ b/n3fit/src/evolven3fit_new/__init__.py @@ -0,0 +1 @@ +from validphys._version import __version__ diff --git a/n3fit/src/n3fit/__init__.py b/n3fit/src/n3fit/__init__.py index 73a5163bc9..7346cacc8b 100644 --- a/n3fit/src/n3fit/__init__.py +++ b/n3fit/src/n3fit/__init__.py @@ -1,2 +1 @@ -from n3fit.version import build_version -__version__ = build_version +from validphys._version import __version__ diff --git a/n3fit/src/n3fit/version.py b/n3fit/src/n3fit/version.py deleted file mode 100644 index adf81433ef..0000000000 --- a/n3fit/src/n3fit/version.py +++ /dev/null @@ -1,41 +0,0 @@ -# This file gets overwritten on deployemt, don't modify -def __give_git(): - # Get the path to this file - from pathlib import Path - - file_dir = Path(__file__).parent - from subprocess import run, CalledProcessError - - try: - result = run( - ["git", "describe", "--tags", "--long", "--dirty=-dev"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - tag = run( - ["git", "describe", "--abbrev=0", "--tags"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - githash = run( - ["git", "rev-parse", "--short", "HEAD"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - version = result.replace(f"-g{githash}", f"+g{githash}").replace( - f"{tag}-", f"{tag}." - ) - except CalledProcessError: - # In principle this function should not exist on an installed version - # but who knows. Also maybe git doesn't work on the machine or whatever - version = "unknown" - return version - - -build_version = __give_git() diff --git a/nnpdfcpp/CMakeLists.txt b/nnpdfcpp/CMakeLists.txt index 35d0a6f5ed..c97a0dfcd5 100644 --- a/nnpdfcpp/CMakeLists.txt +++ b/nnpdfcpp/CMakeLists.txt @@ -10,15 +10,5 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/binaries) # execute project specific targets add_subdirectory(src) -# install data -install(DIRECTORY ${PROJECT_SOURCE_DIR}/nnpdfcpp/data/ DESTINATION ${PROFILE_PREFIX}/data/ MESSAGE_NEVER) - -# install results -install(DIRECTORY DESTINATION ${PROFILE_PREFIX}/results/) -install(DIRECTORY DESTINATION ${PROFILE_PREFIX}/hyperscan_results/) - -file(WRITE ${PROJECT_BINARY_DIR}/nnpdfcpp/README.md "Store here your fit output.") -install(FILES ${PROJECT_BINARY_DIR}/nnpdfcpp/README.md DESTINATION ${PROFILE_PREFIX}/results/) - # install configs install(DIRECTORY ${PROJECT_SOURCE_DIR}/nnpdfcpp/config/ DESTINATION ${PROFILE_PREFIX}/config/) diff --git a/nnpdfcpp/README.md b/nnpdfcpp/README.md deleted file mode 100644 index 5c972bf81c..0000000000 --- a/nnpdfcpp/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# nnpdfcpp -The main programs used in the NNPDF fitting framework. - -## Project summary and aim - -This project contains the principle fitting code of the NNPDF collaboration, -along with it's associated utility programs. - -The main projects are -- filter: Performs fit setup and data kinematic cuts according to an input - runcard. -- nnfit: Performs a NNPDF replica fit based upon the results directory output - but filter. - -and the extra optional programs: -- evolvefit: evolve PDF neural network using APFEL -- fiatlux: generate a T0 set with the photon PDF via `libfiatlux` diff --git a/nnpdfcpp/data/commondata b/nnpdfcpp/data/commondata new file mode 120000 index 0000000000..bda8e72e6e --- /dev/null +++ b/nnpdfcpp/data/commondata @@ -0,0 +1 @@ +../../validphys2/src/validphys/datafiles/commondata \ No newline at end of file diff --git a/nnpdfcpp/data/disp_theory.py b/nnpdfcpp/data/disp_theory.py deleted file mode 100755 index 78c0db26e5..0000000000 --- a/nnpdfcpp/data/disp_theory.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env python - -import sqlite3 as lite -import sys,os - -# Attempt to find tablulate -import imp -try: - imp.find_module('tabulate') - found = True -except ImportError: - found = False - -# Install/import tabulate -if found == False: - os.system("pip install tabulate --user") -from tabulate import tabulate - -# sqlite con -con = None - -try: - con = lite.connect('theory.db') - - cur = con.cursor() - cur.execute('SELECT SQLITE_VERSION()') - - data = cur.fetchone() - - print("SQLite version: %s" % data) - - cur.execute('SELECT * FROM TheoryIndex') - col_names = [cn[0] for cn in cur.description] - col_sub = [col_names[0], col_names[33]] - - - table = [] - rows = cur.fetchall() - for row in rows: - table.append([row[0], row[36]]) - - print(tabulate(table, headers=col_sub)) - -except lite.Error as e: - - print("Error %s:" % e.args[0]) - sys.exit(1) - -finally: - - if con: - con.close() diff --git a/nnpdfcpp/data/disp_theory.py b/nnpdfcpp/data/disp_theory.py new file mode 120000 index 0000000000..da854220bb --- /dev/null +++ b/nnpdfcpp/data/disp_theory.py @@ -0,0 +1 @@ +../../validphys2/src/validphys/datafiles/disp_theory.py \ No newline at end of file diff --git a/nnprofile_example.yaml b/nnprofile_example.yaml new file mode 100644 index 0000000000..5e675579bc --- /dev/null +++ b/nnprofile_example.yaml @@ -0,0 +1,15 @@ +# Example and recommended configuration for nnprofile.yaml +# you can put this file in +# ${XDG_CONFIG_HOME}/NNPDF/nnprofile.yaml +# which usually defaults to +# ~/.config/NNPDF/nnprofile.yaml +# To change the configuration of the NNPDF code framework + +nnpdf_share: ~/.local/share/NNPDF + +results_path: results +theories_path: theories +hyperscan_path: hyperscan +validphys_cache_path: vp-cache + +# With these options downloaded theories will go to ~/.local/share/NNPDF/theories diff --git a/pyproject.toml b/pyproject.toml index 0305f8c4cc..a77affe24f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,127 @@ +[build-system] +requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.1.0"] +build-backend = "poetry_dynamic_versioning.backend" + +[tool.poetry] +name = "nnpdf" +version = "0.0.0" +description = "An open-source machine learning framework for global analyses of parton distributions." +readme = "README.md" +authors = [ + "NNPDF Collaboration" +] +classifiers = [ + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Topic :: Scientific/Engineering", + "Topic :: Scientific/Engineering :: Physics", + "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", +] +license = "GPL-3.0-or-later" +repository = "https://github.com/NNPDF/nnpdf" +# Packages installed together within the nnpdf metapackage +packages = [ + { include = "n3fit", from = "n3fit/src" }, + { include = "evolven3fit_new", from = "n3fit/src" }, + { include = "validphys", from = "validphys2/src" }, +] +# Data files +include = [ + # The profile is included together with the validphys package + "validphys2/src/validphys/nnprofile_default.yaml", + # While commondata and theory.db are separated into the datafiles folder + "validphys2/src/validphys/datafiles/commondata/*", + "validphys2/src/validphys/datafiles/theory.db", + # The version file is ignored by git so it needs to be explicitly included + "validphys2/src/validphys/_version.py" +] + +[tool.poetry.scripts] +n3fit = "n3fit.scripts.n3fit_exec:main" +validphys = "validphys.scripts.main:main" +# Fitting scripts +evolven3fit_new = "n3fit.scripts.evolven3fit_new:main" +vp-setupfit = "n3fit.scripts.vp_setupfit:main" +varflavors = "n3fit.scripts.varflavors:main" +postfit = "validphys.scripts.postfit:main" +# validphys helpers and scripts +vp-upload = "validphys.scripts.vp_upload:main" +wiki-upload = "validphys.scripts.wiki_upload:main" +vp-get = "validphys.scripts.vp_get:main" +vp-comparefits = "validphys.scripts.vp_comparefits:main" +vp-fitrename = "validphys.scripts.vp_fitrename:main" +vp-checktheory = "validphys.scripts.vp_checktheory:main" +vp-rebuild-data = "validphys.scripts.vp_rebuild_data:main" +vp-pdfrename = "validphys.scripts.vp_pdfrename:main" +vp-pdffromreplicas = "validphys.scripts.vp_pdffromreplicas:main" +vp-list = "validphys.scripts.vp_list:main" +vp-nextfitruncard = "validphys.scripts.vp_nextfitruncard:main" +vp-hyperoptplot = "validphys.scripts.vp_hyperoptplot:main" +vp-deltachi2 = "validphys.scripts.vp_deltachi2:main" + +[tool.poetry.dependencies] +# Generic dependencies (i.e., validphys) +python = "^3.9" +matplotlib = ">=3.3.0,<3.8" +pineappl = "^0.6.2" +pandas = "<2" +numpy = "*" +validobj = "*" +prompt_toolkit = "*" +# Reportengine (and its dependencies) need to be installed in a bit more manual way +reportengine = { git = "https://github.com/NNPDF/reportengine", rev = "3bb2b1d"} +ruamel_yaml = {version = "<0.18"} +# Fit +psutil = "*" +tensorflow = "*" +eko = "^0.14.0" +# Hyperopt +hyperopt = "*" +seaborn = "*" +# LHAPDF installation for debugging purposes +# a3b2bbc3ced97675ac3a71df45f55ba = "*" +# Optional dependencies +# tests +pytest = {version = "*", optional = true} +pytest-mpl = {version = "*", optional = true} +hypothesis = {version = "*", optional = true} +# docs +recommonmark = {version = "*", optional = true} +sphinxcontrib-bibtex = {version = "*", optional = true} +sphinx_rtd_theme = {version = "*", optional = true} +sphinx = {version = "^4.0.2", optional = true} +# qed +fiatlux = {version = "*", optional = true} +# without lhapdf +pdfflow = {version = "^1.2.1", optional = true} +lhapdf-management = {version = "^0.5", optional = true} + +# Optional dependencies +[tool.poetry.extras] +tests = ["pytest", "pytest-mpl", "hypothesis"] +docs = ["recommonmark", "sphinxcontrib", "sphinx-rtd-theme", "sphinx"] +qed = ["fiatlux"] +nolha = ["pdfflow", "lhapdf-management"] + +[tool.poetry-dynamic-versioning] +enable = true +vcs = "git" +metadata = true +dirty = true +semver = true +pattern = "default-unprefixed" # we don't use v in the tags + +[tool.poetry-dynamic-versioning.files."validphys2/src/validphys/_version.py"] +persistent-substitution = true +initial-content = """ +__version__ = "0.0.0" +""" + +[tool.poetry-dynamic-versioning.substitution] +files = ["validphys2/src/validphys/_version.py"] + + + [tool.black] line-length = 100 skip-string-normalization = 1 diff --git a/validphys2/setup.py b/validphys2/setup.py deleted file mode 100644 index 4f89706db7..0000000000 --- a/validphys2/setup.py +++ /dev/null @@ -1,60 +0,0 @@ -from __future__ import print_function -import sys -from setuptools import setup, find_packages - -if sys.version_info < (3,6): - print("validphys requires Python 3.6 or later", file=sys.stderr) - sys.exit(1) - -with open('README.md') as f: - long_desc = f.read() - -setup(name= "validphys", - version = '4.0', - description = "NNPDF analysis framework", - author = "Zahari Kassabov", - author_email = "kassabov@to.infn.it", - url="https://gitlab.cern.ch/NNPDF/validphys2", - long_description = long_desc, - entry_points = {'console_scripts': - [ - 'validphys = validphys.scripts.main:main', - 'vp-upload = validphys.scripts.vp_upload:main', - 'wiki-upload = validphys.scripts.wiki_upload:main', - 'postfit = validphys.scripts.postfit:main', - 'vp-get = validphys.scripts.vp_get:main', - 'vp-comparefits = validphys.scripts.vp_comparefits:main', - 'vp-fitrename = validphys.scripts.vp_fitrename:main', - 'vp-checktheory = validphys.scripts.vp_checktheory:main', - 'vp-rebuild-data = validphys.scripts.vp_rebuild_data:main', - 'vp-pdfrename = validphys.scripts.vp_pdfrename:main', - 'vp-pdffromreplicas = validphys.scripts.vp_pdffromreplicas:main', - 'vp-list = validphys.scripts.vp_list:main', - 'vp-nextfitruncard = validphys.scripts.vp_nextfitruncard:main', - 'vp-hyperoptplot = validphys.scripts.vp_hyperoptplot:main', - 'vp-deltachi2 = validphys.scripts.vp_deltachi2:main', - ]}, - package_dir = {'': 'src'}, - packages = find_packages('src'), - package_data = { - #TODO: Get rid of this nonsense - '':['*.template', '*.mplstyle', '*.csv', '*.yaml', '*.md', '*.png', '*.pickle'], - 'tests/regressions': ['*'], - 'comparefit': ['*'], - 'tests/baseline': ['*'], - 'cuts': ['*'], - 'scalevariations': ['*'], - 'hyperplot': ['*'], - 'deltachi2': ['*'], - }, - zip_safe = False, - classifiers=[ - 'Operating System :: Unix', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', - 'Topic :: Scientific/Engineering', - 'Topic :: Scientific/Engineering :: Physics', - ], - ) - diff --git a/validphys2/src/validphys/__init__.py b/validphys2/src/validphys/__init__.py index 407f181cbc..8dee4bf825 100644 --- a/validphys2/src/validphys/__init__.py +++ b/validphys2/src/validphys/__init__.py @@ -1,4 +1 @@ -# We don't want to import stuff here that could slow down the import times -from validphys.version import build_version - -__version__ = build_version +from ._version import __version__ diff --git a/validphys2/src/validphys/core.py b/validphys2/src/validphys/core.py index 7d1fe69c79..ef50faf3ff 100644 --- a/validphys2/src/validphys/core.py +++ b/validphys2/src/validphys/core.py @@ -1,12 +1,8 @@ # -*- coding: utf-8 -*- """ Core datastructures used in the validphys data model. -Created on Wed Mar 9 15:19:52 2016 - -@author: Zahari Kassabov """ -from __future__ import generator_stop - +from dataclasses import dataclass import enum import functools import inspect @@ -507,18 +503,12 @@ def __init__(self, name, commondataspec, fkspec, maxlambda, thspec): cuts = Cuts(commondataspec, None) self.maxlambda = maxlambda super().__init__( - name=name, - commondata=commondataspec, - fkspecs=fkspec, - thspec=thspec, - cuts=cuts, + name=name, commondata=commondataspec, fkspecs=fkspec, thspec=thspec, cuts=cuts ) def to_unweighted(self): log.warning( - "Trying to unweight %s, %s are always unweighted", - self.__class__.__name__, - self.name, + "Trying to unweight %s, %s are always unweighted", self.__class__.__name__, self.name ) return self @@ -590,9 +580,7 @@ def to_unweighted(self): """Return a copy of the group with the weights for all experiments set to one. Note that the results cannot be used as a namespace.""" return self.__class__( - name=self.name, - datasets=[ds.to_unweighted() for ds in self.datasets], - dsinputs=None, + name=self.name, datasets=[ds.to_unweighted() for ds in self.datasets], dsinputs=None ) @@ -705,20 +693,18 @@ def sample_trials(self, n=None, base_params=None, sigma=4.0): return np.random.choice(all_trials, replace=False, size=n, p=weights) +@dataclass class TheoryIDSpec: - def __init__(self, id, path): - self.id = id - self.path = path + id: int + path: Path + dbpath: Path def __iter__(self): yield self.id yield self.path def get_description(self): - dbpath = self.path.parent / 'theory.db' - return fetch_theory(dbpath, self.id) - - __slots__ = ('id', 'path') + return fetch_theory(self.dbpath, self.id) def __repr__(self): return f"{self.__class__.__name__}(id={self.id}, path={self.path!r})" @@ -726,6 +712,9 @@ def __repr__(self): def __str__(self): return f"Theory {self.id}" + def __hash__(self): + return hash(self.path.as_posix()) + @property def yamldb_path(self): return self.path / "yamldb" @@ -855,11 +844,7 @@ def moment(self, order): return np.sum(np.power((data[1::2] - data[2::2]) / self.rescale_factor / 2, order), axis=0) -STAT_TYPES = dict( - symmhessian=SymmHessianStats, - hessian=HessianStats, - replicas=MCStats, -) +STAT_TYPES = dict(symmhessian=SymmHessianStats, hessian=HessianStats, replicas=MCStats) class Filter: diff --git a/validphys2/src/validphys/datafiles/__init__.py b/validphys2/src/validphys/datafiles/__init__.py new file mode 100644 index 0000000000..f80600b6cb --- /dev/null +++ b/validphys2/src/validphys/datafiles/__init__.py @@ -0,0 +1,5 @@ +import pathlib + +path_vpdata = pathlib.Path(__file__).parent +path_commondata = pathlib.Path(__file__).with_name('commondata') +path_theorydb = pathlib.Path(__file__).with_name('theory.db') diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLAS1JET11_SF-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLAS1JET11_SF-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS2P76TEV_SF-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-ATLASR04JETS36PB_SF-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CDFR2KT-all.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CDFR2KT-all.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CDFR2KT-all.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CDFR2KT-all.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CDFR2KT_SF-all.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CDFR2KT_SF-all.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CDFR2KT_SF-all.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CDFR2KT_SF-all.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMS1JET276TEV_SF-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMS1JET276TEV_SF-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-00_05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-00_05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-00_05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-00_05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-05_10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-05_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-05_10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-05_10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-10_15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-10_15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-10_15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-10_15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-15_20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-15_20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-15_20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-15_20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-20_25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-20_25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11-20_25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11-20_25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-00_05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-00_05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-00_05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-00_05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-05_10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-05_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-05_10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-05_10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-10_15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-10_15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-10_15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-10_15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-15_20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-15_20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-15_20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-15_20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-20_25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-20_25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THSYS-CMSJETS11_SF-20_25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THSYS-CMSJETS11_SF-20_25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLAS1JET11-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLAS1JET11-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS2P76TEV-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-1.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-1.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-1.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-1.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-2.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-2.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-2.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-2.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-3.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-3.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-3.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-3.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-4.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-4.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-4.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-4.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-5.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-5.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-5.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-5.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-6.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-6.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-6.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-6.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-7.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-7.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-7.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-ATLASR04JETS36PB-7.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-00-05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-00-05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-00-05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-00-05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-05-10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-05-10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-05-10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-05-10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-10-15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-10-15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-10-15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-10-15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-15-20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-15-20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-15-20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-15-20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-20-25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-20-25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-20-25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-20-25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-25-30.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-25-30.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-25-30.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMS1JET276TEV-25-30.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-00_05.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-00_05.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-00_05.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-00_05.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-05_10.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-05_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-05_10.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-05_10.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-10_15.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-10_15.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-10_15.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-10_15.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-15_20.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-15_20.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-15_20.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-15_20.dat diff --git a/nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-20_25.dat b/validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-20_25.dat similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/THscales/THSYS-CMSJETS11-20_25.dat rename to validphys2/src/validphys/datafiles/commondata/31systematics/THscales/THSYS-CMSJETS11-20_25.dat diff --git a/nnpdfcpp/data/commondata/31systematics/postprocess_jets.sh b/validphys2/src/validphys/datafiles/commondata/31systematics/postprocess_jets.sh similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/postprocess_jets.sh rename to validphys2/src/validphys/datafiles/commondata/31systematics/postprocess_jets.sh diff --git a/nnpdfcpp/data/commondata/31systematics/process_jets.sh b/validphys2/src/validphys/datafiles/commondata/31systematics/process_jets.sh similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/process_jets.sh rename to validphys2/src/validphys/datafiles/commondata/31systematics/process_jets.sh diff --git a/nnpdfcpp/data/commondata/31systematics/process_zpt.sh b/validphys2/src/validphys/datafiles/commondata/31systematics/process_zpt.sh similarity index 100% rename from nnpdfcpp/data/commondata/31systematics/process_zpt.sh rename to validphys2/src/validphys/datafiles/commondata/31systematics/process_zpt.sh diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS1JET11.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS1JET11.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS1JET11_NEW_SCALE.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_NEW_SCALE.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS1JET11_NEW_SCALE.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_NEW_SCALE.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS1JET11_NEW_SCALE_CORR.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_NEW_SCALE_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS1JET11_NEW_SCALE_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_NEW_SCALE_CORR.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS1JET11_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS1JET11_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS1JET11_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASDY2D8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASDY2D8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASDY2D8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASDY2D8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASLOMASSDY11EXT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASLOMASSDY11EXT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASLOMASSDY11EXT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASLOMASSDY11EXT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASPHT12.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT12.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASPHT12.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT12.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASPHT12_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT12_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASPHT12_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT12_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASPHT15.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT15.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASPHT15.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT15.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASPHT15_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT15_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASPHT15_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASPHT15_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASR04JETS2P76TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS2P76TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASR04JETS2P76TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS2P76TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASR04JETS2P76TEV_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS2P76TEV_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASR04JETS2P76TEV_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS2P76TEV_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASR04JETS36PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS36PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASR04JETS36PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS36PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASR04JETS36PB_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS36PB_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASR04JETS36PB_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASR04JETS36PB_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASR06JETS36PB_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASR06JETS36PB_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASR06JETS36PB_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASR06JETS36PB_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTPTNORM_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTRAPNORM_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTMNORM_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTOPDIFF8TEVTTRAPNORM_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASTTBARTOT8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASTTBARTOT8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWPT31PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWPT31PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWPT31PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWPT31PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWRAP11CC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWRAP11CC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWRAP11CC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWRAP11CC.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWRAP36PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWRAP36PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWRAP36PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWRAP36PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWZRAP11.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWZRAP11.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWZRAP11CC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11CC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWZRAP11CC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11CC.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWZRAP11CF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11CF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWZRAP11CF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP11CF.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWZRAP36PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP36PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWZRAP36PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZRAP36PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASWZTOT13TEV81PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZTOT13TEV81PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASWZTOT13TEV81PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASWZTOT13TEV81PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZHIGHMASS49FB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZHIGHMASS49FB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZHIGHMASS49FB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZHIGHMASS49FB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZPT7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZPT7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZPT8TEVMDIST.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT8TEVMDIST.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZPT8TEVMDIST.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT8TEVMDIST.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZPT8TEVYDIST.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT8TEVYDIST.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZPT8TEVYDIST.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZPT8TEVYDIST.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZRAP11CC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZRAP11CC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZRAP11CC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZRAP11CC.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLASZRAP36PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLASZRAP36PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLASZRAP36PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLASZRAP36PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R04.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R04.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R04.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R04.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06_DEC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06_DEC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06_DEC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06_DEC.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06_UNC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06_UNC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_1JET_8TEV_R06_UNC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_1JET_8TEV_R06_UNC.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_2JET_7TEV_R04.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_2JET_7TEV_R04.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_2JET_7TEV_R04.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_2JET_7TEV_R04.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_2JET_7TEV_R06.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_2JET_7TEV_R06.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_2JET_7TEV_R06.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_2JET_7TEV_R06.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_DY_2D_8TEV_LOWMASS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_DY_2D_8TEV_LOWMASS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_DY_2D_8TEV_LOWMASS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_DY_2D_8TEV_LOWMASS.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_SINGLETOP_TCH_R_8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_SINGLETOP_TCH_R_8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTBARTOT_13TEV_FULLLUMI.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WCHARM_WM_DIFF_7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WCHARM_WM_DIFF_7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WCHARM_WM_DIFF_7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WCHARM_WM_DIFF_7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WCHARM_WP_DIFF_7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WCHARM_WP_DIFF_7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WCHARM_WP_DIFF_7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WCHARM_WP_DIFF_7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WMU_8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WMU_8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WMU_8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WMU_8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WM_JET_8TEV_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WM_JET_8TEV_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WM_JET_8TEV_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WM_JET_8TEV_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WM_JET_8TEV_PTJ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WM_JET_8TEV_PTJ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WM_JET_8TEV_PTJ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WM_JET_8TEV_PTJ.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WP_JET_8TEV_PT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WP_JET_8TEV_PT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WP_JET_8TEV_PT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WP_JET_8TEV_PT.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WP_JET_8TEV_PTJ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WP_JET_8TEV_PTJ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WP_JET_8TEV_PTJ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WP_JET_8TEV_PTJ.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_WZ_TOT_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WZ_TOT_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_WZ_TOT_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_WZ_TOT_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_W_TOT_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_W_TOT_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_W_TOT_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_W_TOT_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_ATLAS_Z_TOT_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_Z_TOT_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ATLAS_Z_TOT_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ATLAS_Z_TOT_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSD_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSD_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSD_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSD_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSD_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSD_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSD_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSD_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSD_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSP.dat diff --git a/nnpdfcpp/data/commondata/DATA_BCDMSP_dwsh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_BCDMSP_dwsh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_BCDMSP_dwsh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_BCDMSP_dwsh.dat diff --git a/nnpdfcpp/data/commondata/DATA_CDFR2KT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CDFR2KT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CDFR2KT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CDFR2KT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CDFR2KT_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CDFR2KT_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CDFR2KT_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CDFR2KT_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_CDFZRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CDFZRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CDFZRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CDFZRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_CDFZRAP_NEW.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CDFZRAP_NEW.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CDFZRAP_NEW.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CDFZRAP_NEW.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNB.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNBPb.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNBPb.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNBPb_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNBPb_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNBPb_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNBPb_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNBPb_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNBPb_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNBPb_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNBPb_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNBPb_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNU.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNU.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNU.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNU.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNUPb.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNUPb.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNUPb_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNUPb_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNUPb_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNUPb_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNUPb_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNUPb_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_CHORUSNUPb_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CHORUSNUPb_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CHORUSNUPb_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS1JET276TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS1JET276TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS1JET276TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS1JET276TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS1JET276TEV_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS1JET276TEV_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS1JET276TEV_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS1JET276TEV_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSDY2D11.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSDY2D11.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSDY2D11.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSDY2D11.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSDY2D12.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSDY2D12.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSDY2D12.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSDY2D12.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSJETS11.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSJETS11.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSJETS11_NEW_SCALE.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11_NEW_SCALE.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSJETS11_NEW_SCALE.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11_NEW_SCALE.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSJETS11_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSJETS11_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSJETS11_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTOPDIFF8TEVTTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTOPDIFF8TEVTTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT5TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT5TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT5TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT5TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSTTBARTOT_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSTTBARTOT_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSTTBARTOT_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSWCHARMRAT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSWCHARMRAT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSWCHARMRAT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSWCHARMRAT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSWCHARMTOT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSWCHARMTOT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSWCHARMTOT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSWCHARMTOT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSWEASY840PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSWEASY840PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSWEASY840PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSWEASY840PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSWMASY47FB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSWMASY47FB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSWMASY47FB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSWMASY47FB.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSWMU8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSWMU8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSWMU8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSWMU8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMSZDIFF12.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMSZDIFF12.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMSZDIFF12.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMSZDIFF12.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_1JET_8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_1JET_8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_1JET_8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_1JET_8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_2JET_3D_8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_3D_8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_2JET_3D_8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_3D_8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_2JET_5TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_5TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_2JET_5TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_5TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_2JET_7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_2JET_7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_2JET_7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_HMDY_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_HMDY_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_HMDY_DE_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_DE_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_HMDY_DE_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_DE_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_HMDY_DM_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_DM_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_HMDY_DM_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_HMDY_DM_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_R_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_R_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_R_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_R_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_R_8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_R_8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_R_8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_R_8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_TOT_7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_TOT_7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_SINGLETOP_TCH_TOT_7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_SINGLETOP_TCH_TOT_7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.dat diff --git a/nnpdfcpp/data/commondata/DATA_CMS_WCHARM_DIFF_UNNORM_13TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_CMS_WCHARM_DIFF_UNNORM_13TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_CMS_WCHARM_DIFF_UNNORM_13TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_CMS_WCHARM_DIFF_UNNORM_13TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0R2CON.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0R2CON.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0R2CON.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0R2CON.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0WEASY.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0WEASY.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0WEASY.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0WEASY.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0WMASY.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0WMASY.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0WMASY.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0WMASY.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0ZRAP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0ZRAP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0ZRAP_40.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP_40.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0ZRAP_40.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP_40.dat diff --git a/nnpdfcpp/data/commondata/DATA_D0ZRAP_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_D0ZRAP_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_D0ZRAP_SF.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE605.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE605.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE605.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE605.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE605_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE605_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE605_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE605_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE605_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE605_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE605_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE605_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE605_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE605_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE605_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE605_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE605_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE605_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE605_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE605_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886P.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886P.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886P.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886P.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886R.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886R.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886R.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886R.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886R_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886R_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886R_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886R_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886R_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886R_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886R_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886R_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886R_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE886_D.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE886_D.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE886_D.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE886_D.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN01.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN01.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN01.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN01.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN02.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN02.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN02.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN02.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN03.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN03.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN03.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN03.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN04.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN04.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN04.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN04.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN05.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN05.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN05.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN05.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN06.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN06.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN06.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN06.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN07.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN07.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN07.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN07.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN08.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN08.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN08.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN08.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN09.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN09.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN09.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN09.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_BIN10.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN10.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_BIN10.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_BIN10.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906R_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906R_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906R_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_DYE906_D.dat b/validphys2/src/validphys/datafiles/commondata/DATA_DYE906_D.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_DYE906_D.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_DYE906_D.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_CC_EMP_140_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EMP_140_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_CC_EMP_140_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EMP_140_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_CC_EMP_140_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EMP_140_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_CC_EMP_140_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EMP_140_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_CC_EPP_140_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EPP_140_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_CC_EPP_140_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EPP_140_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_CC_EPP_140_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EPP_140_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_CC_EPP_140_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_CC_EPP_140_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_28_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_28_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_28_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_28_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_28_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_28_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_28_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_28_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_66_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_66_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_66_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_66_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_66_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_66_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_66_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_66_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_88_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_88_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_88_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_88_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_88_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_88_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMD_88_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMD_88_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_140_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_140_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_140_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_140_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_140_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_140_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_140_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_140_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_28_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_28_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_28_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_28_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_28_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_28_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_28_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_28_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_44_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_44_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_44_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_44_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_44_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_44_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_44_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_44_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_63_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_63_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_63_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_63_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_63_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_63_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EMP_63_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EMP_63_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_28_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_28_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_28_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_28_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_28_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_28_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_28_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_28_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_66_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_66_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_66_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_66_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_66_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_66_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_66_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_66_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_88_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_88_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_88_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_88_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_88_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_88_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPD_88_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPD_88_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_140_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_140_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_140_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_140_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_140_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_140_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_140_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_140_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_28_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_28_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_28_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_28_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_28_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_28_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_28_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_28_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_44_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_44_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_44_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_44_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_44_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_44_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_44_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_44_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_63_OPT.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_63_OPT.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_63_OPT.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_63_OPT.dat diff --git a/nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_63_PES.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_63_PES.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EIC_NC_EPP_63_PES.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EIC_NC_EPP_63_PES.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2C.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2C.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2C_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2C_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2C_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2C_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2C_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2C_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2C_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2C_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2C_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2D.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2D.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2D.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2D.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2P.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2P.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2P.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2P.dat diff --git a/nnpdfcpp/data/commondata/DATA_EMCF2c1987.dat b/validphys2/src/validphys/datafiles/commondata/DATA_EMCF2c1987.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_EMCF2c1987.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_EMCF2c1987.dat diff --git a/nnpdfcpp/data/commondata/DATA_H1HERAF2B.dat b/validphys2/src/validphys/datafiles/commondata/DATA_H1HERAF2B.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_H1HERAF2B.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_H1HERAF2B.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBCCEM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBCCEM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBCCEM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBCCEM.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBCCEP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBCCEP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBCCEP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBCCEP.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBNCEM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBNCEM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEM.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBNCEP460.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP460.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBNCEP460.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP460.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBNCEP575.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP575.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBNCEP575.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP575.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBNCEP820.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP820.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBNCEP820.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP820.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMBNCEP920.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP920.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMBNCEP920.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMBNCEP920.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMB_SIGMARED_B.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMB_SIGMARED_B.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMB_SIGMARED_B.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMB_SIGMARED_B.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERACOMB_SIGMARED_C.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERACOMB_SIGMARED_C.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERACOMB_SIGMARED_C.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERACOMB_SIGMARED_C.dat diff --git a/nnpdfcpp/data/commondata/DATA_HERAF2CHARM.dat b/validphys2/src/validphys/datafiles/commondata/DATA_HERAF2CHARM.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_HERAF2CHARM.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_HERAF2CHARM.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXT3.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT3.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXT3.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT3.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXT3_543.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT3_543.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXT3_543.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT3_543.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXT8.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT8.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXT8.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXT8.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV3.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV3.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV3.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV3.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV3_543.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV3_543.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV3_543.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV3_543.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV8.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV8.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV8.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV8.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV8_543.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV8_543.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV8_543.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV8_543.dat diff --git a/nnpdfcpp/data/commondata/DATA_INTEGXV_543.dat b/validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV_543.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_INTEGXV_543.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_INTEGXV_543.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBW36PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBW36PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBW36PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBW36PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBW36PB_40.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBW36PB_40.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBW36PB_40.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBW36PB_40.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBWMU7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBWMU7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBWMU7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBWMU7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBWMU8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBWMU8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBWMU8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBWMU8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBWZMU7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBWZMU7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBWZMU7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBWZMU7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBWZMU8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBWZMU8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBWZMU8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBWZMU8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBZ940PB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBZ940PB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBZ940PB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBZ940PB.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBZEE2FB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBZEE2FB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBZEE2FB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBZEE2FB.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBZEE2FB_40.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBZEE2FB_40.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBZEE2FB_40.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBZEE2FB_40.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBZMU7TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBZMU7TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBZMU7TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBZMU7TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCBZMU8TEV.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCBZMU8TEV.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCBZMU8TEV.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCBZMU8TEV.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCB_WENU_8TEV_A.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCB_WENU_8TEV_A.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCB_WENU_8TEV_A.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCB_WENU_8TEV_A.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCB_WENU_8TEV_R.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCB_WENU_8TEV_R.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCB_WENU_8TEV_R.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCB_WENU_8TEV_R.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCB_Z_13TEV_DIELECTRON.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCB_Z_13TEV_DIELECTRON.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCB_Z_13TEV_DIELECTRON.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCB_Z_13TEV_DIELECTRON.dat diff --git a/nnpdfcpp/data/commondata/DATA_LHCB_Z_13TEV_DIMUON.dat b/validphys2/src/validphys/datafiles/commondata/DATA_LHCB_Z_13TEV_DIMUON.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_LHCB_Z_13TEV_DIMUON.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_LHCB_Z_13TEV_DIMUON.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMC.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD_D.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_D.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD_D.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_D.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_NMCPD_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NMCPD_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NMCPD_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMN.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMN.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMN.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMN.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMNFe.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMNFe.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNBDMNFe_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNBDMNFe_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMN.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMN.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMN.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMN.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMNFe.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMNFe.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_NTVNUDMNFe_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_NTVNUDMNFe_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYC.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYC.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYC.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYC.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCBD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCBD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBD.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCBDB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBDB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCBDB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBDB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCBS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCBS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCBSB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBSB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCBSB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCBSB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCD.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCDB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCDB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCDB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCDB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYCSB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYCSB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYCSB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYCSB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYD.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYU.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYU.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYU.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYU.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUBD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUBD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBD.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUBDB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBDB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUBDB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBDB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUBS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUBS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUBSB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBSB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUBSB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUBSB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUD.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUDB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUDB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUDB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUDB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSDYUSB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSDYUSB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSDYUSB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSDYUSB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C_17PTS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_17PTS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C_17PTS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_17PTS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C_CCE.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCE.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C_CCE.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCE.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C_CCE_17PTS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCE_17PTS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C_CCE_17PTS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCE_17PTS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C_CCP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C_CCP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCP.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2C_CCP_17PTS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCP_17PTS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2C_CCP_17PTS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2C_CCP_17PTS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2DW.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2DW.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2DW.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2DW.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2S.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2S.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2S.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2S.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSF2U.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSF2U.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSF2U.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSF2U.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSFLL.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSFLL.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSFLL.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSFLL.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSFLL_19PTS.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSFLL_19PTS.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSFLL_19PTS.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSFLL_19PTS.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXCQ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXCQ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXCQ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXCQ.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXDB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXDB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXDB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXDB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXDQ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXDQ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXDQ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXDQ.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXGL.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXGL.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXGL.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXGL.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXSB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXSB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXSB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXSB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXSQ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXSQ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXSQ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXSQ.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXUB.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXUB.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXUB.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXUB.dat diff --git a/nnpdfcpp/data/commondata/DATA_POSXUQ.dat b/validphys2/src/validphys/datafiles/commondata/DATA_POSXUQ.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_POSXUQ.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_POSXUQ.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACD.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACD.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACD.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACD.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACD_dw.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACD_dw.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACD_dw.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACD_dw.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACD_dw_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACD_dw_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACD_dw_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACD_dw_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACD_sh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACD_sh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACD_sh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACD_sh.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACD_sh_ite.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACD_sh_ite.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACD_sh_ite.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACD_sh_ite.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACP.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACP.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACP.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACP.dat diff --git a/nnpdfcpp/data/commondata/DATA_SLACP_dwsh.dat b/validphys2/src/validphys/datafiles/commondata/DATA_SLACP_dwsh.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_SLACP_dwsh.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_SLACP_dwsh.dat diff --git a/nnpdfcpp/data/commondata/DATA_ZEUSHERAF2B.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ZEUSHERAF2B.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ZEUSHERAF2B.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ZEUSHERAF2B.dat diff --git a/nnpdfcpp/data/commondata/DATA_ZEUSHERAF2B_SF.dat b/validphys2/src/validphys/datafiles/commondata/DATA_ZEUSHERAF2B_SF.dat similarity index 100% rename from nnpdfcpp/data/commondata/DATA_ZEUSHERAF2B_SF.dat rename to validphys2/src/validphys/datafiles/commondata/DATA_ZEUSHERAF2B_SF.dat diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_DIJET.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DIJET.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_DIJET.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DIJET.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_DIS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DIS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_DIS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DIS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_DYP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DYP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_DYP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_DYP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_JPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_JPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_JPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_JPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_JRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_JRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_JRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_JRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_MLL.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_MLL.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_MLL.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_MLL.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWJ_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWJ_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_MLL.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_MLL.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_MLL.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_MLL.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_PTRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_PTRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_PTRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_PTRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_EWK_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_EWK_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HIG_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HIG_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HIG_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HIG_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_MQQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_MQQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_MQQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_MQQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_PTQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_PTQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_PTQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_PTQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_PTQQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_PTQQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_PTQQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_PTQQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_YQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_YQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_YQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_YQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_YQQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_YQQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_HQP_YQQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_HQP_YQQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_INC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_INC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_INC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_INC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_JET.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_JET.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_JET.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_JET.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTINGTYPE_PHT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_PHT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTINGTYPE_PHT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTINGTYPE_PHT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE_CORR.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE_CORR.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE_CORR.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_NEW_SCALE_CORR.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS1JET11_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS1JET11_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASDY2D8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASDY2D8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASDY2D8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASDY2D8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASLOMASSDY11EXT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASLOMASSDY11EXT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASLOMASSDY11EXT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASLOMASSDY11EXT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASPHT12.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT12.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASPHT12.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT12.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASPHT12_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT12_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASPHT12_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT12_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASPHT15.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT15.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASPHT15.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT15.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASPHT15_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT15_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASPHT15_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASPHT15_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS2P76TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS2P76TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS2P76TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS2P76TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS2P76TEV_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS2P76TEV_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS2P76TEV_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS2P76TEV_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS36PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS36PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS36PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS36PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS36PB_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS36PB_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASR04JETS36PB_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR04JETS36PB_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASR06JETS36PB_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR06JETS36PB_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASR06JETS36PB_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASR06JETS36PB_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTPTNORM_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTRAPNORM_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTMNORM_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTOPDIFF8TEVTTRAPNORM_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASTTBARTOT8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASTTBARTOT8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWPT31PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWPT31PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWPT31PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWPT31PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWRAP11CC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWRAP11CC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWRAP11CC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWRAP11CC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWRAP36PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWRAP36PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWRAP36PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWRAP36PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11CC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11CC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11CC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11CC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11CF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11CF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP11CF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP11CF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP36PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP36PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWZRAP36PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZRAP36PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASWZTOT13TEV81PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZTOT13TEV81PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASWZTOT13TEV81PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASWZTOT13TEV81PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZHIGHMASS49FB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZHIGHMASS49FB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZHIGHMASS49FB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZHIGHMASS49FB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZPT7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZPT7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZPT8TEVMDIST.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT8TEVMDIST.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZPT8TEVMDIST.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT8TEVMDIST.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZPT8TEVYDIST.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT8TEVYDIST.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZPT8TEVYDIST.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZPT8TEVYDIST.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZRAP11CC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZRAP11CC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZRAP11CC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZRAP11CC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLASZRAP36PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZRAP36PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLASZRAP36PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLASZRAP36PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R04.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R04.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R04.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R04.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_DEC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_DEC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_DEC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_DEC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_UNC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_UNC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_UNC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_1JET_8TEV_R06_UNC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_2JET_7TEV_R04.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_2JET_7TEV_R04.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_2JET_7TEV_R04.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_2JET_7TEV_R04.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_2JET_7TEV_R06.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_2JET_7TEV_R06.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_2JET_7TEV_R06.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_2JET_7TEV_R06.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_DY_2D_8TEV_LOWMASS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_DY_2D_8TEV_LOWMASS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_DY_2D_8TEV_LOWMASS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_DY_2D_8TEV_LOWMASS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_SINGLETOP_TCH_R_8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTBARTOT_13TEV_FULLLUMI.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTBARTOT_13TEV_FULLLUMI.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTBARTOT_13TEV_FULLLUMI.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTBARTOT_13TEV_FULLLUMI.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WCHARM_WM_DIFF_7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WCHARM_WM_DIFF_7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WCHARM_WM_DIFF_7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WCHARM_WM_DIFF_7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WCHARM_WP_DIFF_7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WCHARM_WP_DIFF_7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WCHARM_WP_DIFF_7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WCHARM_WP_DIFF_7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WMU_8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WMU_8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WMU_8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WMU_8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PTJ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PTJ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PTJ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WM_JET_8TEV_PTJ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PTJ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PTJ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PTJ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WP_JET_8TEV_PTJ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_WZ_TOT_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WZ_TOT_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_WZ_TOT_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_WZ_TOT_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_W_TOT_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_W_TOT_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_W_TOT_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_W_TOT_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ATLAS_Z_TOT_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_Z_TOT_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ATLAS_Z_TOT_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ATLAS_Z_TOT_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSD_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSD_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSD_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSD_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSD_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSD_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSD_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSD_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSD_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_BCDMSP_dwsh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSP_dwsh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_BCDMSP_dwsh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_BCDMSP_dwsh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CDFR2KT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFR2KT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CDFR2KT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFR2KT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CDFR2KT_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFR2KT_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CDFR2KT_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFR2KT_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CDFZRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFZRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CDFZRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFZRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CDFZRAP_NEW.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFZRAP_NEW.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CDFZRAP_NEW.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CDFZRAP_NEW.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNBPb_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNBPb_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNU.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNU.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNU.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNU.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CHORUSNUPb_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CHORUSNUPb_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS1JET276TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS1JET276TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS1JET276TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS1JET276TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS1JET276TEV_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS1JET276TEV_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS1JET276TEV_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS1JET276TEV_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSDY2D11.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSDY2D11.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSDY2D11.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSDY2D11.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSDY2D12.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSDY2D12.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSDY2D12.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSDY2D12.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSJETS11.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSJETS11.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSJETS11_NEW_SCALE.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11_NEW_SCALE.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSJETS11_NEW_SCALE.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11_NEW_SCALE.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSJETS11_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSJETS11_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSJETS11_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTPTNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTPTNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTPTNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTPTNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTOPDIFF8TEVTTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTOPDIFF8TEVTTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT5TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT5TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT5TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT5TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSTTBARTOT_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSTTBARTOT_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSWCHARMRAT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWCHARMRAT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSWCHARMRAT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWCHARMRAT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSWCHARMTOT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWCHARMTOT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSWCHARMTOT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWCHARMTOT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSWEASY840PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWEASY840PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSWEASY840PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWEASY840PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSWMASY47FB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWMASY47FB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSWMASY47FB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWMASY47FB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSWMU8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWMU8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSWMU8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSWMU8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMSZDIFF12.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSZDIFF12.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMSZDIFF12.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMSZDIFF12.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_1JET_8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_1JET_8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_1JET_8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_1JET_8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_3D_8TEV.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_3D_8TEV.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_3D_8TEV.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_3D_8TEV.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_5TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_5TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_5TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_5TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_2JET_7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_2JET_7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_DE_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_DE_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_DE_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_DE_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_DM_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_DM_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_HMDY_DM_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_HMDY_DM_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_R_8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_TOT_7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_TOT_7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_SINGLETOP_TCH_TOT_7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_SINGLETOP_TCH_TOT_7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_CMS_WCHARM_DIFF_UNNORM_13TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_WCHARM_DIFF_UNNORM_13TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_CMS_WCHARM_DIFF_UNNORM_13TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_CMS_WCHARM_DIFF_UNNORM_13TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0R2CON.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0R2CON.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0R2CON.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0R2CON.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0WEASY.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0WEASY.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0WEASY.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0WEASY.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0WMASY.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0WMASY.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0WMASY.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0WMASY.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0ZRAP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0ZRAP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0ZRAP_40.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP_40.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0ZRAP_40.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP_40.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_D0ZRAP_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_D0ZRAP_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_D0ZRAP_SF.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE605.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE605.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE605_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE605_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE605_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE605_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE605_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE605_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE605_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE605_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE605_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886P.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886P.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886P.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886P.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886R.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886R.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886R_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886R_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886R_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886R_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886R_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886R_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886R_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886R_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886R_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE886_D.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886_D.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE886_D.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE886_D.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN01.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN01.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN01.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN01.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN02.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN02.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN02.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN02.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN03.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN03.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN03.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN03.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN04.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN04.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN04.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN04.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN05.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN05.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN05.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN05.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN06.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN06.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN06.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN06.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN07.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN07.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN07.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN07.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN08.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN08.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN08.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN08.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN09.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN09.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN09.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN09.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN10.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN10.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_BIN10.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_BIN10.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906R_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906R_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906R_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_DYE906_D.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906_D.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_DYE906_D.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_DYE906_D.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EMP_140_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EMP_140_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EMP_140_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EMP_140_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EMP_140_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EMP_140_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EMP_140_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EMP_140_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EPP_140_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EPP_140_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EPP_140_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EPP_140_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EPP_140_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EPP_140_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_CC_EPP_140_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_CC_EPP_140_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_28_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_28_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_28_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_28_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_28_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_28_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_28_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_28_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_66_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_66_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_66_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_66_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_66_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_66_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_66_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_66_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_88_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_88_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_88_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_88_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_88_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_88_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMD_88_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMD_88_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_140_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_140_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_140_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_140_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_140_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_140_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_140_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_140_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_28_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_28_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_28_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_28_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_28_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_28_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_28_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_28_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_44_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_44_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_44_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_44_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_44_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_44_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_44_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_44_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_63_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_63_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_63_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_63_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_63_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_63_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EMP_63_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EMP_63_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_28_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_28_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_28_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_28_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_28_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_28_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_28_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_28_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_66_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_66_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_66_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_66_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_66_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_66_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_66_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_66_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_88_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_88_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_88_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_88_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_88_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_88_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPD_88_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPD_88_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_140_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_140_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_140_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_140_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_140_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_140_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_140_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_140_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_28_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_28_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_28_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_28_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_28_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_28_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_28_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_28_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_44_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_44_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_44_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_44_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_44_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_44_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_44_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_44_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_63_OPT.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_63_OPT.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_63_OPT.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_63_OPT.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_63_PES.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_63_PES.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EIC_NC_EPP_63_PES.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EIC_NC_EPP_63_PES.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2C.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2C.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2C_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2C_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2C_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2C_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2C_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2C_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2C_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2C_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2C_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2D.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2D.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2D.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2D.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2P.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2P.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2P.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2P.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_EMCF2c1987.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2c1987.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_EMCF2c1987.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_EMCF2c1987.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_H1HERAF2B.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_H1HERAF2B.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_H1HERAF2B.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_H1HERAF2B.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBCCEM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBCCEM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBCCEM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBCCEM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBCCEP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBCCEP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBCCEP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBCCEP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP460.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP460.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP460.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP460.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP575.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP575.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP575.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP575.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP820.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP820.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP820.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP820.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP920.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP920.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMBNCEP920.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMBNCEP920.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMB_SIGMARED_B.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMB_SIGMARED_B.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMB_SIGMARED_B.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMB_SIGMARED_B.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERACOMB_SIGMARED_C.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMB_SIGMARED_C.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERACOMB_SIGMARED_C.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERACOMB_SIGMARED_C.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_HERAF2CHARM.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_HERAF2CHARM.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_HERAF2CHARM.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_HERAF2CHARM.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXT3.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT3.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXT3.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT3.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXT3_543.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT3_543.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXT3_543.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT3_543.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXT8.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT8.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXT8.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXT8.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV3.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV3.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV3.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV3.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV3_543.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV3_543.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV3_543.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV3_543.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV8.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV8.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV8.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV8.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV8_543.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV8_543.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV8_543.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV8_543.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_INTEGXV_543.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV_543.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_INTEGXV_543.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_INTEGXV_543.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBW36PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBW36PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBW36PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBW36PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBW36PB_40.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBW36PB_40.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBW36PB_40.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBW36PB_40.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBWMU7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWMU7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBWMU7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWMU7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBWMU8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWMU8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBWMU8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWMU8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBWZMU7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWZMU7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBWZMU7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWZMU7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBWZMU8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWZMU8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBWZMU8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBWZMU8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBZ940PB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZ940PB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBZ940PB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZ940PB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBZEE2FB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZEE2FB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBZEE2FB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZEE2FB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBZEE2FB_40.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZEE2FB_40.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBZEE2FB_40.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZEE2FB_40.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBZMU7TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZMU7TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBZMU7TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZMU7TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCBZMU8TEV.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZMU8TEV.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCBZMU8TEV.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCBZMU8TEV.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCB_WENU_8TEV_A.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_WENU_8TEV_A.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCB_WENU_8TEV_A.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_WENU_8TEV_A.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCB_WENU_8TEV_R.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_WENU_8TEV_R.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCB_WENU_8TEV_R.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_WENU_8TEV_R.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCB_Z_13TEV_DIELECTRON.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_Z_13TEV_DIELECTRON.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCB_Z_13TEV_DIELECTRON.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_Z_13TEV_DIELECTRON.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_LHCB_Z_13TEV_DIMUON.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_Z_13TEV_DIMUON.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_LHCB_Z_13TEV_DIMUON.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_LHCB_Z_13TEV_DIMUON.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD_D.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_D.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD_D.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_D.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NMCPD_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NMCPD_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NMCPD_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMN.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMN.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMN.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMN.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_dw.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_dw.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_dw.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_dw.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_dw_ite.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_dw_ite.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_dw_ite.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_dw_ite.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_sh.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_sh.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_sh.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_sh.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_sh_ite.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_sh_ite.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNBDMNFe_sh_ite.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNBDMNFe_sh_ite.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMN.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMN.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMN.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMN.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_dw.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_dw.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_dw.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_dw.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_dw_ite.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_dw_ite.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_dw_ite.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_dw_ite.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_sh.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_sh.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_sh.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_sh.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_sh_ite.yml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_sh_ite.yml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_NTVNUDMNFe_sh_ite.yml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_NTVNUDMNFe_sh_ite.yml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYC.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYC.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYC.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYC.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCBD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCBD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCBDB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBDB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCBDB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBDB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCBS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCBS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCBSB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBSB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCBSB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCBSB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCDB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCDB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCDB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCDB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYCSB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCSB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYCSB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYCSB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYU.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYU.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYU.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYU.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUBD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUBD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUBDB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBDB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUBDB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBDB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUBS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUBS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUBSB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBSB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUBSB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUBSB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUDB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUDB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUDB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUDB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSDYUSB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUSB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSDYUSB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSDYUSB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C_17PTS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_17PTS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C_17PTS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_17PTS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCE.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCE.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCE.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCE.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCE_17PTS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCE_17PTS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCE_17PTS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCE_17PTS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCP_17PTS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCP_17PTS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2C_CCP_17PTS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2C_CCP_17PTS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2DW.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2DW.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2DW.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2DW.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2S.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2S.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2S.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2S.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSF2U.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2U.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSF2U.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSF2U.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSFLL.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSFLL.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSFLL.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSFLL.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSFLL_19PTS.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSFLL_19PTS.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSFLL_19PTS.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSFLL_19PTS.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXCQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXCQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXCQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXCQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXDB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXDB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXDB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXDB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXDQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXDQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXDQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXDQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXGL.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXGL.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXGL.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXGL.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXSB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXSB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXSB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXSB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXSQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXSQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXSQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXSQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXUB.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXUB.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXUB.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXUB.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_POSXUQ.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXUQ.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_POSXUQ.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_POSXUQ.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACD.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACD.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACD_dw.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_dw.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACD_dw.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_dw.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACD_dw_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_dw_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACD_dw_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_dw_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACD_sh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_sh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACD_sh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_sh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACD_sh_ite.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_sh_ite.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACD_sh_ite.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACD_sh_ite.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACP.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACP.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACP.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACP.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_SLACP_dwsh.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACP_dwsh.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_SLACP_dwsh.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_SLACP_dwsh.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_WEASY.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_WEASY.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_WEASY.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_WEASY.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_WMASY.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_WMASY.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_WMASY.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_WMASY.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ZEUSHERAF2B.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ZEUSHERAF2B.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ZEUSHERAF2B.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ZEUSHERAF2B.yaml diff --git a/nnpdfcpp/data/commondata/PLOTTING_ZEUSHERAF2B_SF.yaml b/validphys2/src/validphys/datafiles/commondata/PLOTTING_ZEUSHERAF2B_SF.yaml similarity index 100% rename from nnpdfcpp/data/commondata/PLOTTING_ZEUSHERAF2B_SF.yaml rename to validphys2/src/validphys/datafiles/commondata/PLOTTING_ZEUSHERAF2B_SF.yaml diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_20.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_20.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_20.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_20.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DECORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DECORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DECORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DECORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_CORR_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DECORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DECORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DECORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DECORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_NEW_SCALE_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS1JET11_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASDY2D8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASDY2D8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASDY2D8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASDY2D8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASLOMASSDY11EXT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASLOMASSDY11EXT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASLOMASSDY11EXT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASLOMASSDY11EXT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT12_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT12_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT12_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT12_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT12_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT12_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT12_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT12_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT15_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT15_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT15_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT15_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT15_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT15_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASPHT15_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASPHT15_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS2P76TEV_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR04JETS36PB_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR06JETS36PB_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR06JETS36PB_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASR06JETS36PB_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASR06JETS36PB_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTPTNORM_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTRAPNORM_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTMNORM_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTOPDIFF8TEVTTRAPNORM_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASTTBARTOT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASTTBARTOT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWPT31PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWPT31PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWPT31PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWPT31PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWRAP11CC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWRAP11CC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWRAP11CC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWRAP11CC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWRAP36PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWRAP36PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWRAP36PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWRAP36PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEC.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEC.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEC.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEC.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEC.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEC.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEC.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEC.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11CF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP11_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP11_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP36PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP36PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZRAP36PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZRAP36PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZTOT13TEV81PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZTOT13TEV81PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASWZTOT13TEV81PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASWZTOT13TEV81PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZHIGHMASS49FB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZHIGHMASS49FB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZHIGHMASS49FB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZHIGHMASS49FB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT7TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT7TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT7TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT7TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVMDIST_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZPT8TEVYDIST_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZRAP11CC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZRAP11CC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZRAP11CC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZRAP11CC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZRAP36PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZRAP36PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLASZRAP36PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLASZRAP36PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R04_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R04_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R04_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R04_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_ATLAS.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_ATLAS.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_ATLAS.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_ATLAS.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_UNC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_UNC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_UNC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_1JET_8TEV_R06_UNC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_STRONG.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_STRONG.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_STRONG.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_STRONG.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_WEAK.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_WEAK.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_WEAK.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R04_WEAK.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_STRONG.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_STRONG.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_STRONG.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_STRONG.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_WEAK.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_WEAK.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_WEAK.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_2JET_7TEV_R06_WEAK.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_DY_2D_8TEV_LOWMASS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_DY_2D_8TEV_LOWMASS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_DY_2D_8TEV_LOWMASS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_DY_2D_8TEV_LOWMASS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_PT_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_TBAR_RAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_PT_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_7TEV_T_RAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_PT_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_TBAR_RAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_PT_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_DIFF_8TEV_T_RAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TOPDIFF_DILEPT_8TEV_TTRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTBARTOT_13TEV_FULLLUMI_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTBARTOT_13TEV_FULLLUMI_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTBARTOT_13TEV_FULLLUMI_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTBARTOT_13TEV_FULLLUMI_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPTNORM_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TPT_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_ATLAS.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_ATLAS.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_ATLAS.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_ATLAS.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAPNORM_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TRAP_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTMNORM_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTM_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_ATLAS.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_ATLAS.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_ATLAS.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_ATLAS.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAPNORM_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_CORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_CORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_CORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_CORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_PSUNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_PSUNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_PSUNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_TTB_DIFF_8TEV_LJ_TTRAP_PSUNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WM_DIFF_7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WCHARM_WP_DIFF_7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WMU_8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WMU_8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WMU_8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WMU_8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PTJ_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_ATLAS.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_ATLAS.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_ATLAS.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_ATLAS.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WM_JET_8TEV_PT_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PTJ_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_ATLAS.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_ATLAS.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_ATLAS.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_ATLAS.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WP_JET_8TEV_PT_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WZ_TOT_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WZ_TOT_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_WZ_TOT_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_WZ_TOT_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_W_TOT_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_W_TOT_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_W_TOT_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_W_TOT_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_Z_TOT_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_Z_TOT_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ATLAS_Z_TOT_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ATLAS_Z_TOT_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSD_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSD_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSP_dwsh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSP_dwsh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_BCDMSP_dwsh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_BCDMSP_dwsh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFR2KT_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFR2KT_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFZRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFZRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFZRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFZRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFZRAP_NEW_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFZRAP_NEW_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CDFZRAP_NEW_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CDFZRAP_NEW_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNBPb_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNUPb_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNU_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNU_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CHORUSNU_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CHORUSNU_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_10_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_10_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_10_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_10_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS1JET276TEV_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D11_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D11_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D11_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D11_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D11_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D11_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D11_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D11_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D12_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D12_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSDY2D12_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSDY2D12_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_20.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_20.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_20.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_20.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_NEW_SCALE_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_NEW_SCALE_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_NEW_SCALE_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_NEW_SCALE_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_SF_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_SF_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_SF_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_SF_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSJETS11_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSJETS11_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTPTNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTPTNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTPTNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTPTNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTOPDIFF8TEVTTRAPNORM_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT5TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT5TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT5TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT5TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSTTBARTOT_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSTTBARTOT_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMRAT_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMRAT_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMRAT_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMRAT_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMRAT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMRAT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMRAT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMRAT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMTOT_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMTOT_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMTOT_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMTOT_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMTOT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMTOT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWCHARMTOT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWCHARMTOT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWEASY840PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWEASY840PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWEASY840PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWEASY840PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMASY47FB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMASY47FB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMASY47FB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMASY47FB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMU8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMU8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMU8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMU8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMU8TEV_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMU8TEV_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSWMU8TEV_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSWMU8TEV_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_10_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_10_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_10_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_10_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_NNPDF31.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_NNPDF31.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMSZDIFF12_NNPDF31.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMSZDIFF12_NNPDF31.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_1JET_8TEV_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_3D_8TEV_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_5TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_5TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_5TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_5TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_NP.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_NP.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_NP.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_2JET_7TEV_NP.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_DE_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_DE_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_DE_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_DE_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_DM_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_DM_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_HMDY_DM_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_HMDY_DM_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_R_8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_TOT_7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_TOT_7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_TOT_7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_SINGLETOP_TCH_TOT_7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TRAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_MTT_TTRAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTBAR_2D_DIFF_PT_TRAP_NORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPTNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_2L_TTRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPTNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTMNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAPNORM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_TTB_DIFF_13TEV_2016_LJ_TTRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_10.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_10.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_10.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_10.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_CMS_WCHARM_DIFF_UNNORM_13TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0R2CON_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0R2CON_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0R2CON_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0R2CON_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0WEASY_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0WEASY_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0WEASY_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0WEASY_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0WMASY_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0WMASY_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0WMASY_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0WMASY_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_40_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_40_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_40_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_40_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_D0ZRAP_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_D0ZRAP_SF_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_UNCORR.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_UNCORR.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_UNCORR.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_UNCORR.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE605_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE605_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886P_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886P_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886P_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886P_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886R_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886R_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886_D_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886_D_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE886_D_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE886_D_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN01_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN01_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN01_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN01_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN02_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN02_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN02_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN02_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN03_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN03_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN03_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN03_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN04_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN04_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN04_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN04_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN05_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN05_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN05_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN05_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN06_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN06_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN06_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN06_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN07_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN07_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN07_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN07_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN08_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN08_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN08_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN08_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN09_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN09_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN09_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN09_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN10_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN10_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_BIN10_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_BIN10_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906R_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906R_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906_D_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906_D_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_DYE906_D_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_DYE906_D_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EMP_140_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_CC_EPP_140_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_28_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_66_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMD_88_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_140_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_28_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_44_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EMP_63_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_28_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_66_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPD_88_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_140_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_28_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_44_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_OPT_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_OPT_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_OPT_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_OPT_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_PES_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_PES_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_PES_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EIC_NC_EPP_63_PES_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2C_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2C_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2D_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2D_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2D_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2D_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2P_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2P_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2P_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2P_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2c1987_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2c1987_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_EMCF2c1987_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_EMCF2c1987_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_H1HERAF2B_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_H1HERAF2B_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_H1HERAF2B_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_H1HERAF2B_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBCCEM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBCCEM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBCCEM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBCCEM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBCCEP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBCCEP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBCCEP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBCCEP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP460_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP460_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP460_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP460_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP575_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP575_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP575_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP575_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP820_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP820_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP820_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP820_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP920_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP920_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMBNCEP920_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMBNCEP920_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_B_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_B_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_B_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_B_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_C_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_C_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_C_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERACOMB_SIGMARED_C_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_HERAF2CHARM_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERAF2CHARM_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_HERAF2CHARM_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_HERAF2CHARM_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT3_543_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT3_543_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT3_543_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT3_543_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT3_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT3_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT3_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT3_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT8_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT8_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXT8_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXT8_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV3_543_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV3_543_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV3_543_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV3_543_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV3_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV3_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV3_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV3_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV8_543_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV8_543_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV8_543_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV8_543_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV8_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV8_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV8_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV8_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV_543_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV_543_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV_543_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV_543_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_INTEGXV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_INTEGXV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBW36PB_40_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBW36PB_40_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBW36PB_40_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBW36PB_40_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBW36PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBW36PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBW36PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBW36PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWMU7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWMU7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWMU7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWMU7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWMU8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWMU8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWMU8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWMU8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWZMU7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWZMU7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWZMU7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWZMU7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWZMU8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWZMU8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBWZMU8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBWZMU8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZ940PB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZ940PB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZ940PB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZ940PB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZEE2FB_40_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZEE2FB_40_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZEE2FB_40_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZEE2FB_40_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZEE2FB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZEE2FB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZEE2FB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZEE2FB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZMU7TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZMU7TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZMU7TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZMU7TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZMU8TEV_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZMU8TEV_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCBZMU8TEV_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCBZMU8TEV_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_A_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_A_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_A_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_A_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_R_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_R_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_R_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_WENU_8TEV_R_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIELECTRON_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIELECTRON_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIELECTRON_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIELECTRON_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIMUON_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIMUON_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIMUON_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_LHCB_Z_13TEV_DIMUON_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_D_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_D_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_D_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_D_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMCPD_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMCPD_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NMC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NMC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NMC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMNFe_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMN_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMN_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNBDMN_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNBDMN_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMNFe_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMN_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMN_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_NTVNUDMN_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_NTVNUDMN_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBDB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBDB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBDB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBDB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBSB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBSB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBSB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBSB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCBS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCBS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCDB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCDB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCDB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCDB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCSB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCSB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCSB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCSB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYCS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYCS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYC_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYC_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYC_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYC_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBDB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBDB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBDB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBDB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBSB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBSB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBSB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBSB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUBS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUBS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUDB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUDB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUDB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUDB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUSB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUSB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUSB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUSB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYUS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYUS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYU_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYU_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSDYU_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSDYU_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_17PTS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_17PTS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_17PTS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_17PTS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCE_17PTS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCE_17PTS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCE_17PTS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCE_17PTS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCE_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCE_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCE_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCE_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCP_17PTS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCP_17PTS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCP_17PTS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCP_17PTS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_CCP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_CCP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2C_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2C_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2DW_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2DW_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2DW_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2DW_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2S_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2S_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2S_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2S_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2U_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2U_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSF2U_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSF2U_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSFLL_19PTS_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSFLL_19PTS_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSFLL_19PTS_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSFLL_19PTS_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSFLL_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSFLL_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSFLL_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSFLL_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXCQ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXCQ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXCQ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXCQ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXDB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXDB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXDB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXDB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXDQ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXDQ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXDQ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXDQ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXGL_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXGL_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXGL_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXGL_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXSB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXSB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXSB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXSB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXSQ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXSQ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXSQ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXSQ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXUB_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXUB_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXUB_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXUB_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXUQ_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXUQ_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_POSXUQ_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_POSXUQ_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_dw_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_dw_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_dw_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_dw_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_dw_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_dw_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_dw_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_dw_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_sh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_sh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_sh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_sh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_sh_ite_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_sh_ite_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACD_sh_ite_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACD_sh_ite_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACP_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACP_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACP_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACP_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACP_dwsh_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACP_dwsh_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_SLACP_dwsh_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_SLACP_dwsh_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ZEUSHERAF2B_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ZEUSHERAF2B_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ZEUSHERAF2B_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ZEUSHERAF2B_DEFAULT.dat diff --git a/nnpdfcpp/data/commondata/systypes/SYSTYPE_ZEUSHERAF2B_SF_DEFAULT.dat b/validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ZEUSHERAF2B_SF_DEFAULT.dat similarity index 100% rename from nnpdfcpp/data/commondata/systypes/SYSTYPE_ZEUSHERAF2B_SF_DEFAULT.dat rename to validphys2/src/validphys/datafiles/commondata/systypes/SYSTYPE_ZEUSHERAF2B_SF_DEFAULT.dat diff --git a/validphys2/src/validphys/datafiles/disp_theory.py b/validphys2/src/validphys/datafiles/disp_theory.py new file mode 100755 index 0000000000..78c0db26e5 --- /dev/null +++ b/validphys2/src/validphys/datafiles/disp_theory.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python + +import sqlite3 as lite +import sys,os + +# Attempt to find tablulate +import imp +try: + imp.find_module('tabulate') + found = True +except ImportError: + found = False + +# Install/import tabulate +if found == False: + os.system("pip install tabulate --user") +from tabulate import tabulate + +# sqlite con +con = None + +try: + con = lite.connect('theory.db') + + cur = con.cursor() + cur.execute('SELECT SQLITE_VERSION()') + + data = cur.fetchone() + + print("SQLite version: %s" % data) + + cur.execute('SELECT * FROM TheoryIndex') + col_names = [cn[0] for cn in cur.description] + col_sub = [col_names[0], col_names[33]] + + + table = [] + rows = cur.fetchall() + for row in rows: + table.append([row[0], row[36]]) + + print(tabulate(table, headers=col_sub)) + +except lite.Error as e: + + print("Error %s:" % e.args[0]) + sys.exit(1) + +finally: + + if con: + con.close() diff --git a/nnpdfcpp/data/theory.db b/validphys2/src/validphys/datafiles/theory.db similarity index 100% rename from nnpdfcpp/data/theory.db rename to validphys2/src/validphys/datafiles/theory.db diff --git a/validphys2/src/validphys/loader.py b/validphys2/src/validphys/loader.py index 5f330fc845..bc8ccd155e 100644 --- a/validphys2/src/validphys/loader.py +++ b/validphys2/src/validphys/loader.py @@ -1,9 +1,5 @@ # -*- coding: utf-8 -*- """ -Created on Wed Mar 9 15:40:38 2016 - -@author: Zahari Kassabov - Resolve paths to useful objects, and query the existence of different resources within the specified paths. """ @@ -14,6 +10,7 @@ import os import os.path as osp import pathlib +import pkgutil import re import shutil import sys @@ -42,11 +39,11 @@ TheoryIDSpec, peek_commondata_metadata, ) +from validphys.datafiles import path_vpdata from validphys.utils import tempfile_cleaner -DEFAULT_NNPDF_PROFILE_PATH = f"{sys.prefix}/share/NNPDF/nnprofile.yaml" - log = logging.getLogger(__name__) +NNPDF_DIR = "NNPDF" class LoaderError(Exception): @@ -115,32 +112,80 @@ class InconsistentMetaDataError(LoaderError): def _get_nnpdf_profile(profile_path=None): """Returns the NNPDF profile as a dictionary + If no ``profile_path`` is provided it will be autodiscovered in the following order: - Environment variable $NNPDF_PROFILE_PATH - {sys.prefix}/share/NNPDF/nnprofile.yaml - {sys.base_prefix}/share/NNPDF/nnprofile.yaml + 1. Environment variable $NNPDF_PROFILE_PATH + 2. ${XDG_CONFIG_HOME}/NNPDF/nnprofile.yaml (usually ~/.config/nnprofile) + + Any value not filled by 1 or 2 will then be filled by the default values + found within the validphys python package `nnporfile_default.yaml` + + If ``nnpdf_share`` is set to the special key ``RELATIVE_TO_PYTHON`` + the python prefix (``Path(sys.prefix)/"share"/"NNPDF"``) will be used - If no profile is found a LoaderError will be thrown """ - profile_path = os.environ.get("NNPDF_PROFILE_PATH", profile_path) + yaml_reader = yaml.YAML(typ='safe', pure=True) + + home_config = pathlib.Path().home() / ".config" + config_folder = pathlib.Path(os.environ.get("XDG_CONFIG_HOME", home_config)) / NNPDF_DIR + + # Set all default values + profile_content = pkgutil.get_data("validphys", "nnprofile_default.yaml") + profile_dict = yaml_reader.load(profile_content) + # including the data_path to the validphys package + profile_dict.setdefault("data_path", path_vpdata) + + # Look at profile path if profile_path is None: - # Check both sys paths - prefix_paths = [sys.prefix, sys.base_prefix] - for prefix in prefix_paths: - check = pathlib.Path(prefix) / "share/NNPDF/nnprofile.yaml" - if check.is_file(): - profile_path = check - break + profile_path = os.environ.get("NNPDF_PROFILE_PATH", profile_path) + + # If profile_path is still none and there is a .config/NNPDF/nnprofile.yaml, read that if profile_path is None: - raise LoaderError("Missing an NNPDF profile file") + if (config_nnprofile := config_folder / "nnprofile.yaml").exists(): + profile_path = config_nnprofile + elif (config_nnprofile := config_folder / "nnprofile.yml").exists(): + profile_path = config_nnprofile + + if profile_path is not None: + with open(profile_path, "r", encoding="utf-8") as f: + profile_entries = yaml_reader.load(f) + if profile_entries is not None: + profile_dict.update(profile_entries) + + nnpdf_share = profile_dict.get("nnpdf_share") + if nnpdf_share is None: + if profile_path is not None: + raise ValueError( + f"`nnpdf_share` is not set in {profile_path}, please set it, e.g.: nnpdf_share: `.local/share/NNPDF`" + ) + raise ValueError( + "`nnpdf_share` not found in validphys, something is very wrong with the installation" + ) - mpath = pathlib.Path(profile_path) + if nnpdf_share == "RELATIVE_TO_PYTHON": + nnpdf_share = pathlib.Path(sys.prefix) / "share" / NNPDF_DIR + + # At this point nnpdf_share needs to be a path to somewhere + nnpdf_share = pathlib.Path(nnpdf_share) + + # Make sure that we expand any ~ or ~ + nnpdf_share = nnpdf_share.expanduser() + + # Make sure we can either write to this directory or it exists try: - with mpath.open() as f: - profile_dict = yaml.safe_load(f) - except (OSError, yaml.YAMLError) as e: - raise LoaderError(f"Could not parse profile file {mpath}: {e}") from e + nnpdf_share.mkdir(exist_ok=True, parents=True) + except PermissionError as e: + raise FileNotFoundError( + f"{nnpdf_share} does not exist and you haven't got permissions to create it!" + ) from e + + # Now read all paths and define them as relative to nnpdf_share (unless given as absolute) + for var in ["results_path", "theories_path", "validphys_cache_path", "hyperscan_path"]: + # if there are any problems setting or getting these variable erroring out is more than justified + absolute_var = nnpdf_share / pathlib.Path(profile_dict[var]).expanduser() + profile_dict[var] = absolute_var.absolute().as_posix() + return profile_dict @@ -158,17 +203,19 @@ def __init__(self, profile=None): # Retrieve important paths from the profile if not given datapath = pathlib.Path(profile["data_path"]) + theories_path = pathlib.Path(profile["theories_path"]) resultspath = pathlib.Path(profile["results_path"]) - # Check whether they exist if not datapath.exists(): raise LoaderError(f"The data path {datapath} does not exist.") - if not resultspath.exists(): - raise LoaderError(f"The results path {resultspath} does not exist.") + # Create the theories and results paths if they don't exist already + theories_path.mkdir(exist_ok=True, parents=True) + resultspath.mkdir(exist_ok=True, parents=True) # And save them up self.datapath = datapath + self._theories_path = theories_path self.resultspath = resultspath self._old_commondata_fits = set() self.nnprofile = profile @@ -176,8 +223,7 @@ def __init__(self, profile=None): @property def hyperscan_resultpath(self): hyperscan_path = pathlib.Path(self.nnprofile["hyperscan_path"]) - if not hyperscan_path.exists(): - raise LoaderError(f"The hyperscan results path {hyperscan_path} does not exist") + hyperscan_path.mkdir(parents=True, exist_ok=True) return hyperscan_path def _vp_cache(self): @@ -274,7 +320,8 @@ def available_theories(self): """Return a string token for each of the available theories""" theory_token = 'theory_' return { - folder.name[len(theory_token) :] for folder in self.datapath.glob(theory_token + '*') + folder.name[len(theory_token) :] + for folder in self._theories_path.glob(theory_token + '*') } @property @@ -374,12 +421,12 @@ def check_commondata(self, setname, sysnum=None, use_fitcommondata=False, fit=No @functools.lru_cache() def check_theoryID(self, theoryID): theoryID = str(theoryID) - theopath = self.datapath / ('theory_%s' % theoryID) + theopath = self._theories_path / f"theory_{theoryID}" if not theopath.exists(): raise TheoryNotFound( "Could not find theory %s. Folder '%s' not found" % (theoryID, theopath) ) - return TheoryIDSpec(theoryID, theopath) + return TheoryIDSpec(theoryID, theopath, self.theorydb_file) @property def theorydb_file(self): @@ -1089,7 +1136,7 @@ def download_theoryID(self, thid): remote = self.remote_theories if thid not in remote: raise TheoryNotFound("Theory %s not available." % thid) - download_and_extract(remote[thid], self.datapath) + download_and_extract(remote[thid], self._theories_path) def download_vp_output_file(self, filename, **kwargs): try: diff --git a/validphys2/src/validphys/nnprofile_default.yaml b/validphys2/src/validphys/nnprofile_default.yaml new file mode 100644 index 0000000000..058273497b --- /dev/null +++ b/validphys2/src/validphys/nnprofile_default.yaml @@ -0,0 +1,68 @@ +# +# Default `nnprofile.yaml` for NNPDF. +# The location of a custom profile can be given with the `NNPDF_PROFILE_PATH` enviroment variable +# otherwise by default ${XDG_CONFIG_HOME}/.config/NNPDF/nnprofile.yaml will be read +# which in most systems defaults to `~/.config/NNPDF/nnprofile.yaml` +# +# +# The following defines where NNPDF resources will be stored +# The directories for results / theories / hyperscan / validphys are declared as +# relative to the nnpdf_share unless explicitly written as absolutes +# +# nnpdf_share accepts the special value ${PYTHON_PREFIX} +# which will default to `python -c "import sys ; print(sys.prefix + "/share/NNPDF/")"` +# and that usually is: +# ${CONDA_PREFIX}/share/NNPDF in conda installations +# ${VIRTUAL_ENV}/share/NNPDF in virtual-env installations +# /usr in most Linux installations +# +# As a bug-prevention measure, if `nnpdf_share` is set to an empty variable +# or (if set to PYTHON_PREFIX) to a non-writtable directory, the code will refuse to run + +# Default to ${PYTHON_PREFIX}, i.e., the prefix or wherever NNPDF was installed +# it (usually) corresponds to ${CONDA_PREFIX} in conda environments and ${VIRTUAL_ENV} in virtual environments +# for instance, if you want all your NNPDF installations to share theories you can do +# nnpdf_share: ~/.local/share/NNPDF/ +nnpdf_share: RELATIVE_TO_PYTHON + +results_path: results +theories_path: theories +hyperscan_path: hyperscan +validphys_cache_path: vp-cache + +# Starting from nnpdf > 4.0.7 the data is bundled together with the vp installation +# data_path: + +# Remote resource locations +fit_urls: + - 'https://data.nnpdf.science/fits/' + - 'https://nnpdf.web.cern.ch/nnpdf/fits/' + +fit_index: 'fitdata.json' + +hyperscan_urls: + - 'https://data.nnpdf.science/hyperscans/' + +hyperscan_index: 'hyperscandata.json' + +theory_urls: + - 'https://nnpdf.web.cern.ch/nnpdf/tables/' + +theory_index: 'theorydata.json' + +lhapdf_urls: + - 'http://lhapdfsets.web.cern.ch/lhapdfsets/current/' +nnpdf_pdfs_urls: + - 'https://data.nnpdf.science/pdfs/' +nnpdf_pdfs_index: 'pdfdata.json' + +#Server side uploading locations +upload_host: 'nnpdf@vp.nnpdf.science' +reports_target_dir: "validphys-reports/" +reports_root_url: 'https://vp.nnpdf.science/' +fits_target_dir: "WEB/fits/" +fits_root_url: 'https://data.nnpdf.science/fits/' +pdfs_target_dir: "WEB/pdfs/" +pdfs_root_url: 'https://data.nnpdf.science/pdfs/' +hyperscan_target_dir: "WEB/hyperscans/" +hyperscan_root_url: 'https://data.nnpdf.science/hyperscans/' diff --git a/validphys2/src/validphys/photon/compute.py b/validphys2/src/validphys/photon/compute.py index 453f45c8ba..8c2bf480b5 100644 --- a/validphys2/src/validphys/photon/compute.py +++ b/validphys2/src/validphys/photon/compute.py @@ -2,7 +2,6 @@ import logging import tempfile -import fiatlux import numpy as np from scipy.integrate import trapezoid from scipy.interpolate import interp1d @@ -93,6 +92,14 @@ def __init__(self, theoryid, lux_params, replicas): self.interpolator = [] self.integral = [] + try: + import fiatlux + except ModuleNotFoundError as e: + log.error("fiatlux not found, please install fiatlux") + raise ModuleNotFoundError( + "Please install fiatlux: `pip install nnpdf[qed]` or `pip install fiatlux`" + ) from e + for replica in replicas: f2 = sf.InterpStructureFunction(path_to_F2, self.luxpdfset.members[replica]) fl = sf.InterpStructureFunction(path_to_FL, self.luxpdfset.members[replica]) diff --git a/validphys2/src/validphys/tests/test_loader.py b/validphys2/src/validphys/tests/test_loader.py index 0c4d68bd51..c2c9c34577 100644 --- a/validphys2/src/validphys/tests/test_loader.py +++ b/validphys2/src/validphys/tests/test_loader.py @@ -3,23 +3,30 @@ Test loading utilities. """ +import os +from pathlib import Path +import subprocess as sp +import sys + +from hypothesis import given, settings +from hypothesis.strategies import composite, sampled_from, sets import numpy as np import pytest -from hypothesis.strategies import sampled_from, sets, composite -from hypothesis import given, settings -from validphys.core import Cuts, CommonDataSpec -from validphys.loader import FallbackLoader, rebuild_commondata_without_cuts, FitNotFound -from validphys.plotoptions import kitable, get_info -from validphys.tests.conftest import FIT +from validphys.core import CommonDataSpec, Cuts +from validphys.loader import FallbackLoader, FitNotFound, rebuild_commondata_without_cuts, NNPDF_DIR +from validphys.plotoptions import get_info, kitable +from validphys.tests.conftest import FIT, FIT_3REPLICAS, THEORYID_NEW l = FallbackLoader() -#The sorted is to appease hypothesis +# The sorted is to appease hypothesis dss = sorted(l.available_datasets - {"PDFEVOLTEST"}) -class MockCuts(): + +class MockCuts: def __init__(self, arr): self.arr = arr + def load(self): return self.arr @@ -66,6 +73,7 @@ def test_rebuild_commondata_without_cuts(tmp_path_factory, arg): nocuts[cuts] = False assert (lncd.get_cv()[nocuts] == 0).all() + @given(inp=commondata_and_cuts()) @settings(deadline=None) def test_kitable_with_cuts(inp): @@ -74,7 +82,92 @@ def test_kitable_with_cuts(inp): tb = kitable(cd, info, cuts=MockCuts(cuts)) assert len(tb) == len(cuts) + def test_load_fit(): assert l.check_fit(FIT) with pytest.raises(FitNotFound): l.check_fit(f"{FIT}/") + + +### nnprofile testing +def _check_download_resource(results_dir, profile=None, res_type="fit", resource=FIT_3REPLICAS): + """Downloads a resource (by default the fit FIT_3REPLICAS and + checks whether it can indeed be found in the given ``results_dir`` + Accepts a ``profile`` pointing to a custom nnprofile which will be set with NNPDF_PROFILE_PATH + """ + custom_environ = dict(os.environ) + if profile is not None: + custom_environ["NNPDF_PROFILE_PATH"] = Path(profile).as_posix() + + sp.run(["vp-get", res_type, resource], env=custom_environ) + + if res_type == "theoryID": + res_location = results_dir / f"theory_{resource}" + else: + res_location = results_dir / resource + + assert res_location.exists() + assert res_location.is_dir() + + +def test_custom_profile_nnpdf_share(tmp_path): + """Creates a custom profile with a key ``nnpdf_share` and checks whether it is used""" + profile_path = tmp_path / "nnprofile.yaml" + profile_path.write_text(f"nnpdf_share: {tmp_path}") + + # Check a fit + _check_download_resource(tmp_path / "results", profile=profile_path) + # Check a theory + _check_download_resource( + tmp_path / "theories", profile=profile_path, res_type="theoryID", resource=str(THEORYID_NEW) + ) + + +def test_custom_profile_explicit(tmp_path): + """Creates a custom profile with explicit paths that should take precedence""" + profile_path = tmp_path / "nnprofile.yaml" + theory_path = tmp_path / "test_theory" + results_path = tmp_path / "test_fit" + + profile_path.write_text( + f""" +theories_path: {theory_path.as_posix()} +results_path: {results_path.as_posix()}""" + ) + + # Check a fit + _check_download_resource(results_path, profile=profile_path) + # Check a theory + _check_download_resource( + theory_path, profile=profile_path, res_type="theoryID", resource=str(THEORYID_NEW) + ) + + +def test_home_profile(tmp_path): + """Check that {XDG_CONFIG_HOME} profile takes precedence""" + original_xdg = os.environ.get("XDG_CONFIG_HOME") + + nnpdf_path = tmp_path / NNPDF_DIR + nnpdf_path.mkdir(exist_ok=True, parents=True) + + profile_path = nnpdf_path / "nnprofile.yaml" + profile_path.write_text(f"nnpdf_share: {tmp_path}") + + os.environ["XDG_CONFIG_HOME"] = tmp_path.as_posix() + + try: + _check_download_resource(tmp_path / "results") + finally: + if original_xdg is None or not original_xdg: + os.environ.pop("XDG_CONFIG_HOME") + else: + os.environ["XDG_CONFIG_HOME"] = original_xdg + + +def test_profile_relative_to_python(tmp_path): + """Check that when the key RELATIVE_TO_PYTHON is used, the sys.prefix is used""" + profile_path = tmp_path / "nnprofile.yaml" + profile_path.write_text("nnpdf_share: RELATIVE_TO_PYTHON") + + results_sys_prefix = Path(sys.prefix) / "share" / NNPDF_DIR / "results" + _check_download_resource(results_sys_prefix, profile=profile_path) diff --git a/validphys2/src/validphys/theorydbutils.py b/validphys2/src/validphys/theorydbutils.py index 4a0c7e6954..3405124780 100644 --- a/validphys2/src/validphys/theorydbutils.py +++ b/validphys2/src/validphys/theorydbutils.py @@ -38,7 +38,7 @@ def make_query(query: str, dbpath: Path): >>> from pathlib import Path as p >>> from validphys.theorydbutils import make_query >>> query = "SELECT * FROM TheoryIndex WHERE ID=53;" - >>> dbpath = p("./nnpdfcpp/data/theory.db") + >>> dbpath = p("./validphys2/src/validphys/datafiles/theory.db") >>> res = make_query(query, dbpath) >>> val = res.fetchone() >>> theory_info_dict = {k[0]: v for k, v in zip(res.description, val)} diff --git a/validphys2/src/validphys/version.py b/validphys2/src/validphys/version.py deleted file mode 100644 index 845e4b697a..0000000000 --- a/validphys2/src/validphys/version.py +++ /dev/null @@ -1,39 +0,0 @@ -# This file gets overwritten on deployemt, don't modify -def __give_git(): - # Get the path to this file - from pathlib import Path - - file_dir = Path(__file__).parent - from subprocess import CalledProcessError, run - - try: - result = run( - ["git", "describe", "--tags", "--long", "--dirty=-dev"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - tag = run( - ["git", "describe", "--abbrev=0", "--tags"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - githash = run( - ["git", "rev-parse", "--short", "HEAD"], - capture_output=True, - text=True, - check=True, - cwd=file_dir, - ).stdout.strip() - version = result.replace(f"-g{githash}", f"+g{githash}").replace(f"{tag}-", f"{tag}.") - except CalledProcessError: - # In principle this function should not exist on an installed version - # but who knows. Also maybe git doesn't work on the machine or whatever - version = "unknown" - return version - - -build_version = __give_git() diff --git a/version.cmake b/version.cmake deleted file mode 100644 index 044ba44163..0000000000 --- a/version.cmake +++ /dev/null @@ -1,3 +0,0 @@ -execute_process(COMMAND python -c "import ${LIBRARY}.version ; print(${LIBRARY}.version.__file__)" OUTPUT_VARIABLE VERSION_PATH) -STRING(STRIP ${VERSION_PATH} VERSION_PATH) -file(WRITE ${VERSION_PATH} ${GIT_VERSION})