diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13398f8..47a64c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,232 +1,74 @@
-# Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+# Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    NUISANCE is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 cmake_minimum_required (VERSION 2.8 FATAL_ERROR)
 
 #Use the compilers found in the path
 find_program(CMAKE_C_COMPILER NAMES $ENV{CC} gcc PATHS ENV PATH NO_DEFAULT_PATH)
 find_program(CMAKE_CXX_COMPILER NAMES $ENV{CXX} g++ PATHS ENV PATH NO_DEFAULT_PATH)
 
 project(NUISANCE)
 
 include(ExternalProject)
 
-enable_language(Fortran)
-
-set (NUISANCE_VERSION_MAJOR 2)
-set (NUISANCE_VERSION_MINOR 7)
+set (NUISANCE_VERSION_MAJOR 3)
+set (NUISANCE_VERSION_MINOR 0)
 set (NUISANCE_VERSION_REVISION 0)
 
 set (NUISANCE_VERSION_STRING "v${NUISANCE_VERSION_MAJOR}r${NUISANCE_VERSION_MINOR}")
 if(${NUISANCE_VERSION_REVISION} STRGREATER "0")
   set (NUISANCE_VERSION_STRING "${NUISANCE_VERSION_STRING}p${NUISANCE_VERSION_REVISION}")
 endif()
 
 #Set this to TRUE to enable build debugging messages
 set(BUILD_DEBUG_MSGS TRUE)
+
 include(${CMAKE_SOURCE_DIR}/cmake/cmessage.cmake)
 
 include(${CMAKE_SOURCE_DIR}/cmake/cacheVariables.cmake)
 
 cmessage(STATUS "CMAKE_INSTALL_PREFIX: \"${CMAKE_INSTALL_PREFIX}\"")
 cmessage(STATUS "CMAKE_BUILD_TYPE: \"${CMAKE_BUILD_TYPE}\"")
 
 ################################################################################
 #                            Check Dependencies
 ################################################################################
 
 ##################################  ROOT  ######################################
 include(${CMAKE_SOURCE_DIR}/cmake/ROOTSetup.cmake)
 
-#################################  HEPMC  ######################################
-include(${CMAKE_SOURCE_DIR}/cmake/HepMC.cmake)
-
-############################  Reweight Engines  ################################
-include(${CMAKE_SOURCE_DIR}/cmake/ReweightEnginesSetup.cmake)
-
-############################  Other Generators  ################################
+################################# InputHandler #################################
+include(${CMAKE_SOURCE_DIR}/cmake/InputHandlerSetup.cmake)
 
-include(${CMAKE_SOURCE_DIR}/cmake/GiBUUSetup.cmake)
-
-if(USE_NUANCE)
-  LIST(APPEND EXTRA_CXX_FLAGS -D__NUANCE_ENABLED__)
-endif()
-
-#################################  Pythia6/8  ####################################
+#################################  Pythia6/8 ###################################
 include(${CMAKE_SOURCE_DIR}/cmake/pythia6Setup.cmake)
-include(${CMAKE_SOURCE_DIR}/cmake/pythia8Setup.cmake)
-
-################################# gperftools ###################################
 
-include(${CMAKE_SOURCE_DIR}/cmake/gperfSetup.cmake)
+################################## FHICLCPP ####################################
+include(${CMAKE_SOURCE_DIR}/cmake/fhiclcppSetup.cmake)
 
-if(NOT NOTEST)
-  enable_testing()
-endif()
-
-SET(GENERATOR_SUPPORT)
-
-foreach(gen NEUT;NuWro;GENIE;GiBUU;NUANCE)
-  if(USE_${gen})
-    SET(GENERATOR_SUPPORT "${GENERATOR_SUPPORT}${gen} ")
-  endif()
-endforeach(gen)
-
-cmessage(STATUS "Generator Input Support: ${GENERATOR_SUPPORT}")
-
-set(MINCODE
-  Routines
-  FCN)
-
-set(CORE
-  MCStudies
-  Genie
-  FitBase
-  Config
-  Logger
-  InputHandler
-  Splines
-  Reweight
-  Utils
-  Statistical
-  #Devel
-  Smearceptance
-  )
-
-LIST(APPEND ALLEXPERIMENTS
-  ANL
-  ArgoNeuT
-  BEBC
-  BNL
-  Electron
-  FNAL
-  GGM
-  K2K
-  MINERvA
-  MiniBooNE
-  SciBooNE
-  T2K)
-
-foreach(exp ${ALLEXPERIMENTS})
-  if(NOT NO_${exp})
-    LIST(APPEND EXPERIMENTS_TO_BUILD ${exp})
-  else()
-    LIST(REVERSE EXTRA_CXX_FLAGS)
-    LIST(APPEND EXTRA_CXX_FLAGS -D__NO_${exp}__)
-    LIST(REVERSE EXTRA_CXX_FLAGS)
-  endif()
-endforeach()
+#Need this to be at the front
+LIST(REVERSE EXTRA_CXX_FLAGS)
+LIST(APPEND EXTRA_CXX_FLAGS -I${CMAKE_SOURCE_DIR}/src)
+LIST(REVERSE EXTRA_CXX_FLAGS)
 
 ################################## COMPILER ####################################
 include(${CMAKE_SOURCE_DIR}/cmake/c++CompilerSetup.cmake)
 
-################################### doxygen ###################################
-
-include(${CMAKE_SOURCE_DIR}/cmake/docsSetup.cmake)
-
 ################################################################################
 
-
-set(MINIMUM_INCLUDE_DIRECTORIES)
-LIST(APPEND MINIMUM_INCLUDE_DIRECTORIES
-  ${RWENGINE_INCLUDE_DIRECTORIES}
-  ${CMAKE_SOURCE_DIR}/src/FitBase
-  ${CMAKE_SOURCE_DIR}/src/Reweight
-  ${CMAKE_SOURCE_DIR}/src/InputHandler
-  ${CMAKE_SOURCE_DIR}/src/Config
-  ${CMAKE_SOURCE_DIR}/src/Logger
-  ${CMAKE_SOURCE_DIR}/src/Statistical
-  ${CMAKE_SOURCE_DIR}/src/Splines
-  ${CMAKE_SOURCE_DIR}/src/Utils
-  ${CMAKE_SOURCE_DIR}/src/Genie)
-
-cmessage(DEBUG "Base include directories: ${MINIMUM_INCLUDE_DIRECTORIES}")
-
-set(EXP_INCLUDE_DIRECTORIES)
-
-foreach(edir ${EXPERIMENTS_TO_BUILD})
-  LIST(APPEND EXP_INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/${edir})
-endforeach()
-cmessage(DEBUG "Included experiments: ${EXP_INCLUDE_DIRECTORIES}")
-
-foreach(mdir ${MINCODE})
-  cmessage (DEBUG "Configuring directory: src/${mdir}")
-  add_subdirectory(src/${mdir})
-endforeach()
-
-foreach(edir ${EXPERIMENTS_TO_BUILD})
-  cmessage (DEBUG "Configuring directory: src/${edir}")
-  add_subdirectory(src/${edir})
-endforeach()
-
-foreach(cdir ${CORE})
-  cmessage (DEBUG "Configuring directory: src/${cdir}")
-  add_subdirectory(src/${cdir})
-endforeach()
-
-cmessage(DEBUG "Module targets: ${MODULETargets}")
-
-set(MODULETargets "${MODULETargets}")
-
-add_subdirectory(app)
-add_subdirectory(src/Tests)
-
-configure_file(cmake/setup.sh.in
-  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/setup.sh" @ONLY)
-install(FILES
-  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/setup.sh" DESTINATION
-  ${CMAKE_INSTALL_PREFIX})
-
-configure_file(cmake/MakeBinaryBlob.in
-  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/MakeBinaryBlob" @ONLY)
-install(PROGRAMS
-  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/MakeBinaryBlob" DESTINATION
-  bin)
-
-if(USE_DYNSAMPLES)
-  SET(ALL_INCLUDES ${MINIMUM_INCLUDE_DIRECTORIES})
-  LIST(APPEND ALL_INCLUDES ${CMAKE_SOURCE_DIR}/src/Smearceptance)
-  LIST(APPEND ALL_INCLUDES ${EXP_INCLUDE_DIRECTORIES})
-
-  string(REPLACE ";" " -I" ALL_INCLUDES_STR "${ALL_INCLUDES}")
-
-  cmessage(DEBUG ${CMAKE_DEPENDLIB_FLAGS})
-  string(REPLACE "-levent " "" CMAKE_DEPENDLIB_FLAGS_NEW ${CMAKE_DEPENDLIB_FLAGS})
-  set(CMAKE_DEPENDLIB_FLAGS ${CMAKE_DEPENDLIB_FLAGS_NEW})
-  cmessage(DEBUG ${CMAKE_DEPENDLIB_FLAGS})
-
-  configure_file(cmake/BuildDynamicSample.in
-    "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/BuildDynamicSample" @ONLY)
-  install(PROGRAMS
-    "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/BuildDynamicSample" DESTINATION
-    bin)
-
-  configure_file(cmake/BuildDynamicSmearcepter.in
-    "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/BuildDynamicSmearcepter" @ONLY)
-  install(PROGRAMS
-    "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/BuildDynamicSmearcepter" DESTINATION
-    bin)
-endif()
-
-install(PROGRAMS
-  "${PROJECT_SOURCE_DIR}/scripts/nuiscardgen" DESTINATION
-  bin)
-
-install(PROGRAMS
-  "${PROJECT_SOURCE_DIR}/scripts/nuissamples" DESTINATION
-  bin)
+add_subdirectory(src)
diff --git a/CMakeLists.txt b/CMakeLists_old.txt
similarity index 100%
copy from CMakeLists.txt
copy to CMakeLists_old.txt
diff --git a/cmake/Prob3++Setup.cmake b/cmake/InputHandlerSetup.cmake
similarity index 54%
copy from cmake/Prob3++Setup.cmake
copy to cmake/InputHandlerSetup.cmake
index 03de820..88ca096 100644
--- a/cmake/Prob3++Setup.cmake
+++ b/cmake/InputHandlerSetup.cmake
@@ -1,42 +1,48 @@
-# Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+# Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    NUISANCE is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-if(USE_PROB3PP)
-
-  LIST(APPEND EXTRA_CXX_FLAGS -D__PROB3PP_ENABLED__)
-
-  ExternalProject_Add(prob3pp
-    PREFIX "${CMAKE_BINARY_DIR}/Ext"
-    URL "http://webhome.phy.duke.edu/~raw22/public/Prob3++/Prob3++.20121225.tar.gz"
-    CONFIGURE_COMMAND ""
-    BUILD_IN_SOURCE 1
-    UPDATE_COMMAND ""
-    BUILD_COMMAND CXXFLAGS=-fPIC CFLAGS=-fPIC make
-    INSTALL_COMMAND ""
-    )
-
-  LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/Ext/src/prob3pp)
+#################################  NuWro  ######################################
+if(USE_NuWro)
+  include(${CMAKE_SOURCE_DIR}/cmake/NuWroSetup.cmake)
+  cmessage(STATUS "Using NuWro Reweight engine.")
+  set(USE_NuWro TRUE CACHE BOOL "Whether to enable NuWro support. <FALSE>" FORCE)
+endif()
 
-  LIST(APPEND EXTRA_LINK_DIRS ${CMAKE_BINARY_DIR}/Ext/src/prob3pp)
+if(NEED_ROOTEVEGEN)
+  cmessage(STATUS "Require ROOT eve generation libraries")
+  LIST(REVERSE ROOT_LIBS)
+  LIST(APPEND ROOT_LIBS
+    Gui
+    Ged
+    Geom
+    TreePlayer
+    EG
+    Eve)
+  LIST(REVERSE ROOT_LIBS)
+endif()
 
-  LIST(APPEND EXTRA_LIBS ThreeProb_2.10)
+if(NEED_ROOTPYTHIA6)
+  cmessage(STATUS "Require ROOT Pythia6 libraries")
+  LIST(APPEND ROOT_LIBS
+    EGPythia6
+    Pythia6)
+endif()
 
-  cmessage(STATUS "Using Prob3++ 2.10")
 
-endif()
+LIST(APPEND EXTRA_LIBS ${ROOT_LIBS})
diff --git a/cmake/NuWroSetup.cmake b/cmake/NuWroSetup.cmake
index f649bff..9440310 100644
--- a/cmake/NuWroSetup.cmake
+++ b/cmake/NuWroSetup.cmake
@@ -1,112 +1,48 @@
-# Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+# Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    NUISANCE is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-if(NOT NUWRO_INPUT_FILE STREQUAL "")
 
-  if(NOT EXISTS ${NUWRO_INPUT_FILE})
-    cmessage(FATAL_ERROR "Expected -DNUWRO_INPUT_FILE to point to a valid input file. Cannot find: '${NUWRO_INPUT_FILE}'")
-  endif()
-
-  if(CMAKE_BUILD_TYPE MATCHES DEBUG)
-    BuildROOTProject(NuWro_event1 ${NUWRO_INPUT_FILE} "event,vec,vect,particle,flags,params,line" STATIC)
-    SET(ROOTLIBNAME "libNuWro_event1.a")
-  else(CMAKE_BUILD_TYPE MATCHES RELEASE)
-    BuildROOTProject(NuWro_event1 ${NUWRO_INPUT_FILE} "event,vec,vect,particle,flags,params,line" SHARED)
-    SET(ROOTLIBNAME "libNuWro_event1.so")
-  endif()
-
-  ADD_CUSTOM_TARGET(NuWro_event1HeaderLink ALL
-    COMMAND ${CMAKE_COMMAND} -E create_symlink
-    ${CMAKE_BINARY_DIR}/NuWro_event1/event.h
-    ${CMAKE_BINARY_DIR}/NuWro_event1/event1.h
-    DEPENDS NuWro_event1)
-
-  LIST(APPEND EXTRA_CXX_FLAGS -D__NUWRO_ENABLED__)
-
-  LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/NuWro_event1)
-
-  LIST(APPEND EXTRA_LINK_DIRS ${CMAKE_BINARY_DIR})
-
-  LIST(APPEND EXTRA_LIBS NuWro_event1)
-
-  LIST(APPEND PROJECTWIDE_EXTRA_DEPENDENCIES NuWro_event1HeaderLink )
-
-  install(TARGETS NuWro_event1 DESTINATION lib)
-
-  SET(NUWRO_BUILT_FROM_FILE TRUE)
+if(NUWRO STREQUAL "")
+  cmessage(FATAL_ERROR "Variable NUWRO is not defined. "
+    "This must be set to point to a prebuilt NuWro instance.")
+endif()
 
-else()
+LIST(APPEND EXTRA_CXX_FLAGS -D__NUWRO_ENABLED__)
 
-  if(NUWRO STREQUAL "")
-    cmessage(FATAL_ERROR "Variable NUWRO is not defined. "
-      "This must be set to point to a prebuilt NuWro instance.")
-  endif()
+LIST(APPEND EXTRA_CXX_FLAGS -I${NUWRO}/src)
 
-  # If you are using a version of NuWro without reweighting use this to compile.
-  if(USE_NuWro_RW)
+if(NOT EXISTS ${NUWRO}/bin/event1.so)
+  if(EXISTS ${NUWRO}/build/${CMAKE_SYSTEM_NAME}/lib)
 
     if(NUWRO_INC STREQUAL "")
       cmessage(FATAL_ERROR "Variable NUWRO_INC is not defined. "
         "This must be set to point to an installed NuWro instance.")
     endif()
 
-    LIST(APPEND EXTRA_CXX_FLAGS -D__NUWRO_ENABLED__ -D__NUWRO_REWEIGHT_ENABLED__)
-
-    if(USE_NuWro_SRW_Event)
-          LIST(APPEND EXTRA_CXX_FLAGS -D__USE_NUWRO_SRW_EVENTS__)
-    endif()
-
-    LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES
-      ${NUWRO}/src
-      ${NUWRO}/src/reweight
-      ${NUWRO_INC}/nuwro)
-
     LIST(APPEND EXTRA_LINK_DIRS ${NUWRO}/build/${CMAKE_SYSTEM_NAME}/lib)
-    LIST(APPEND EXTRA_LIBS reweight event)
-
-  else ()
-    LIST(APPEND EXTRA_CXX_FLAGS -D__NUWRO_ENABLED__)
-
-    LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES ${NUWRO}/src)
-
-    if(NOT EXISTS ${NUWRO}/bin/event1.so)
-      if(EXISTS ${NUWRO}/build/${CMAKE_SYSTEM_NAME}/lib)
-
-        if(NUWRO_INC STREQUAL "")
-          cmessage(FATAL_ERROR "Variable NUWRO_INC is not defined. "
-            "This must be set to point to an installed NuWro instance.")
-        endif()
-
-        LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES ${NUWRO_INC}/nuwro)
-
-        LIST(APPEND EXTRA_LINK_DIRS ${NUWRO}/build/${CMAKE_SYSTEM_NAME}/lib)
-        LIST(APPEND EXTRA_LIBS event)
-      else()
-        cmessage(FATAL_ERROR "Expected to find the NuWro event library in: ${NUWRO}/bin/event1.so, or if using NuWro with reweight support: ${NUWRO}/build/${CMAKE_SYSTEM_NAME}/lib/libevent.a. Is NuWro built?")
-      endif()
-    else()
-      LIST(APPEND EXTRA_SHAREDOBJS ${NUWRO}/bin/event1.so)
-    endif()
-
+    LIST(APPEND EXTRA_LIBS event)
+  else()
+    cmessage(FATAL_ERROR "Expected to find the NuWro event library in: ${NUWRO}/bin/event1.so, or if using NuWro with reweight support: ${NUWRO}/build/${CMAKE_SYSTEM_NAME}/lib/libevent.a. Is NuWro built?")
   endif()
-
-  set(NEED_PYTHIA6 TRUE)
-  set(NEED_ROOTPYTHIA6 TRUE)
+else()
+  LIST(APPEND EXTRA_SHAREDOBJS ${NUWRO}/bin/event1.so)
 endif()
 
+set(NEED_PYTHIA6 TRUE)
+set(NEED_ROOTPYTHIA6 TRUE)
diff --git a/cmake/ROOTSetup.cmake b/cmake/ROOTSetup.cmake
index f6597a3..7ec33b1 100644
--- a/cmake/ROOTSetup.cmake
+++ b/cmake/ROOTSetup.cmake
@@ -1,170 +1,170 @@
-# Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+# Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    NUISANCE is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 if ( NOT DEFINED ENV{ROOTSYS} )
   cmessage (FATAL_ERROR "$ROOTSYS is not defined, please set up ROOT first.")
 else()
   cmessage(STATUS "Using ROOT installed at $ENV{ROOTSYS}")
   set(CMAKE_ROOTSYS $ENV{ROOTSYS})
 endif()
 
 # Get cflags from ROOT
 execute_process (COMMAND root-config
   --cflags OUTPUT_VARIABLE ROOT_CXX_FLAGS_RAW OUTPUT_STRIP_TRAILING_WHITESPACE)
 string(REPLACE " " ";" ROOT_CXX_FLAGS "${ROOT_CXX_FLAGS_RAW}")
 # Get libdir from ROOT
 execute_process (COMMAND root-config
   --libdir OUTPUT_VARIABLE ROOT_LIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 # Get version from ROOT
 execute_process (COMMAND root-config
   --version OUTPUT_VARIABLE ROOT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 # Get features from ROOT
 execute_process (COMMAND root-config
   --features OUTPUT_VARIABLE ROOT_FEATURES OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 LIST(APPEND EXTRA_LINK_DIRS ${ROOT_LIBDIR})
 
 LIST(APPEND ROOT_LIBS
   Core
   Cint
   RIO
   XMLIO
   Net
   Hist
   Graf
   Graf3d
   Gpad
   Tree
   Rint
   Postscript
   Matrix
   Physics
   MathCore
   Thread
   EG
   Geom
   GenVector)
 
 if(USE_MINIMIZER)
 
   if("${ROOT_FEATURES}" MATCHES "minuit2")
     cmessage(STATUS "ROOT built with MINUIT2 support")
     LIST(APPEND EXTRA_CXX_FLAGS -D__MINUIT2_ENABLED__)
   else()
     cmessage(FATAL_ERROR "ROOT built without MINUIT2 support but minimizer functionality requested. Either configure with -DUSE_MINIMIZER=FALSE or use a version of ROOT with MINUIT2 support.")
   endif()
 
   string(REGEX MATCH "6.*" ROOTVERSIXMATCH ${ROOT_VERSION})
   if(ROOTVERSIXMATCH)
     cmessage(STATUS "Using ROOT6, We are essentially flying blind here.")
     LIST(REMOVE_ITEM ROOT_LIBS Cint)
     LIST(APPEND EXTRA_CXX_FLAGS -DROOT6_USE_FIT_FITTER_INTERFACE)
     set(USE_ROOT6 True)
   else()
     string(REGEX MATCH "5.34/([0-9]+)" ROOTVERSMATCH ${ROOT_VERSION})
     if(NOT ROOTVERSMATCH OR ${CMAKE_MATCH_1} LESS "19")
       cmessage(FATAL_ERROR "ROOT Version: ${ROOT_VERSION} has out of date minimizer interface, but minimizer functionality requested. Please configure with -DUSE_MINIMIZER=FALSE or update to 5.34/19 or greater to enable minimization features.")
     endif()
   endif()
 
 endif()
 
 if("${ROOT_FEATURES}" MATCHES "opengl")
   cmessage(STATUS "ROOT built with OpenGL support")
   LIST(APPEND ROOT_LIBS RGL)
 endif()
 
 if(DEFINED NEED_ROOTPYTHIA6 AND NEED_ROOTPYTHIA6)
   LIST(APPEND ROOT_LIBS EGPythia6 Pythia6)
 endif()
 
 cmessage ( STATUS "[ROOT]: root-config --version: ${ROOT_VERSION} ")
 cmessage ( STATUS "[ROOT]: root-config --cflags : ${ROOT_CXX_FLAGS} ")
 cmessage ( STATUS "[ROOT]: root-config --libs   : ${ROOT_LD_FLAGS} ")
 
 LIST(APPEND EXTRA_CXX_FLAGS ${ROOT_CXX_FLAGS})
 
 #Helper functions for building dictionaries
 function(GenROOTDictionary OutputDictName Header LinkDef)
 
   get_directory_property(incdirs INCLUDE_DIRECTORIES)
   string(REPLACE ";" ";-I" LISTDIRINCLUDES "-I${incdirs}")
   string(REPLACE " " ";" LISTCPPFLAGS "${EXTRA_CXX_FLAGS}")
 
   #ROOT5 CINT cannot handle it.
   list(REMOVE_ITEM LISTCPPFLAGS "-std=c++11")
 
   message(STATUS "LISTCPPFLAGS: ${LISTCPPFLAGS}")
   message(STATUS "LISTINCLUDES: ${LISTDIRINCLUDES}")
   #Learn how to generate the Dict.cxx and Dict.hxx
   add_custom_command(
     OUTPUT "${OutputDictName}.cxx" "${OutputDictName}.h"
     COMMAND rootcint
     ARGS -f ${OutputDictName}.cxx -c
     -p ${LISTDIRINCLUDES} ${LISTCPPFLAGS} ${Header} ${LinkDef}
     DEPENDS ${Header};${LinkDef})
 endfunction()
 
 
 function(BuildROOTProject ProjectName InputFile CommaSeparatedClassesToDump LIBLINKMODE)
 
   string(REPLACE "," ";" HeadersToDump ${CommaSeparatedClassesToDump})
   set(OUTPUTFILES ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectSource.cxx
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}LinkDef.h
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectHeaders.h
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectInstances.h)
 
   cmessage(STATUS "As part of ROOT project: ${ProjectName}")
   foreach (header ${HeadersToDump})
     LIST(APPEND OUTPUTFILES "${CMAKE_BINARY_DIR}/${ProjectName}/${header}.h")
     cmessage(STATUS "Will generate: ${CMAKE_BINARY_DIR}/${ProjectName}/${header}.h")
   endforeach()
 
   add_custom_command(
     OUTPUT ${OUTPUTFILES}
     COMMAND ${CMAKE_BINARY_DIR}/src/Utils/DumpROOTClassesFromVector
     ARGS ${InputFile}
       ${CMAKE_BINARY_DIR}/${ProjectName}
       ${CommaSeparatedClassesToDump}
     VERBATIM
     DEPENDS DumpROOTClassesFromVector)
 
   add_custom_target(${ProjectName}_sources
     DEPENDS ${OUTPUTFILES})
 
   GenROOTDictionary(
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectDict
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectHeaders.h
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}LinkDef.h
     )
 
   add_custom_target(${ProjectName}ProjectDict
     DEPENDS
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectDict.cxx
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectDict.h )
   # add_dependencies(${ProjectName}ProjectDict ${ProjectName}_sources)
 
   #ProjectSource.cxx includes ProjectDict.cxx, so no need to add to compilation.
   set(ROAA_SOURCEFILES
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectSource.cxx)
 
   add_library(${ProjectName} ${LIBLINKMODE} ${ROAA_SOURCEFILES})
   add_dependencies(${ProjectName} ${ProjectName}ProjectDict)
 
 endfunction()
diff --git a/cmake/c++CompilerSetup.cmake b/cmake/c++CompilerSetup.cmake
index 67b0361..205fd19 100644
--- a/cmake/c++CompilerSetup.cmake
+++ b/cmake/c++CompilerSetup.cmake
@@ -1,109 +1,83 @@
-# Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+# Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    NUISANCE is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-if(USE_OMP)
-  LIST(APPEND EXTRA_CXX_FLAGS -fopenmp)
-endif()
-
-if(USE_DYNSAMPLES)
-  LIST(APPEND EXTRA_LIBS dl)
-  LIST(APPEND EXTRA_CXX_FLAGS -D__USE_DYNSAMPLES__)
-endif()
-
 set(CXX_WARNINGS -Wall )
 
+LIST(APPEND EXTRA_CXX_FLAGS -std=c++1y -fPIC)
+
 cmessage(DEBUG "EXTRA_CXX_FLAGS: ${EXTRA_CXX_FLAGS}")
 string(REPLACE ";" " " STR_EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STR_EXTRA_CXX_FLAGS} ${CXX_WARNINGS}")
-  set(CMAKE_Fortran_FLAGS_RELEASE "-fPIC")
 
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
-
-if(USE_DYNSAMPLES)
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fPIC")
-  set(CMAKE_Fortran_FLAGS_DEBUG "-fPIC")
-endif()
-
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3")
-
-if(CMAKE_BUILD_TYPE MATCHES DEBUG)
-  set(CURRENT_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_DEBUG})
-elseif(CMAKE_BUILD_TYPE MATCHES RELEASE)
-  set(CURRENT_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
-else()
-  cmessage(FATAL_ERROR "[ERROR]: Unknown CMAKE_BUILD_TYPE (\"${CMAKE_BUILD_TYPE}\"): Should be \"DEBUG\" or \"RELEASE\".")
-endif()
-
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
 
 SET(STR_EXTRA_LINK_DIRS)
 if(NOT EXTRA_LINK_DIRS STREQUAL "")
   string(REPLACE ";" " -L" STR_EXTRA_LINK_DIRS "-L${EXTRA_LINK_DIRS}")
 endif()
 
+LIST(APPEND EXTRA_LIBS dl)
+
 SET(STR_EXTRA_LIBS)
 if(NOT EXTRA_LIBS STREQUAL "")
   SET(STR_EXTRA_LIBS_NO_SCRUB_LINKOPTS)
   string(REPLACE ";" " -l" STR_EXTRA_LIBS_NO_SCRUB_LINKOPTS "-l${EXTRA_LIBS}")
   string(REPLACE "-l-" "-" STR_EXTRA_LIBS ${STR_EXTRA_LIBS_NO_SCRUB_LINKOPTS})
 endif()
 
 SET(STR_EXTRA_SHAREDOBJS)
 if(NOT EXTRA_SHAREDOBJS STREQUAL "")
   string(REPLACE ";" " " STR_EXTRA_SHAREDOBJS "${EXTRA_SHAREDOBJS}")
 endif()
 
 LIST(APPEND EXTRA_LINK_FLAGS -Wl,--no-as-needed)
 SET(STR_EXTRA_LINK_FLAGS)
 if(NOT EXTRA_LINK_FLAGS STREQUAL "")
   string(REPLACE ";" " " STR_EXTRA_LINK_FLAGS "${EXTRA_LINK_FLAGS}")
 endif()
 
 cmessage(DEBUG "EXTRA_LINK_DIRS: ${STR_EXTRA_LINK_DIRS}")
 cmessage(DEBUG "EXTRA_LIBS: ${STR_EXTRA_LIBS}")
 cmessage(DEBUG "EXTRA_SHAREDOBJS: ${STR_EXTRA_SHAREDOBJS}")
 cmessage(DEBUG "EXTRA_LINK_FLAGS: ${STR_EXTRA_LINK_FLAGS}")
 
 if(NOT STR_EXTRA_LINK_DIRS STREQUAL "" AND NOT STR_EXTRA_LIBS STREQUAL "")
   SET(CMAKE_DEPENDLIB_FLAGS "${STR_EXTRA_LINK_DIRS} ${STR_EXTRA_LIBS}")
 endif()
 if(NOT STR_EXTRA_SHAREDOBJS STREQUAL "")
   SET(CMAKE_DEPENDLIB_FLAGS "${CMAKE_DEPENDLIB_FLAGS} ${STR_EXTRA_SHAREDOBJS}")
 endif()
 
 if(NOT EXTRA_LINK_FLAGS STREQUAL "")
   if(NOT CMAKE_LINK_FLAGS STREQUAL "")
     SET(CMAKE_LINK_FLAGS "${CMAKE_LINK_FLAGS} ${STR_EXTRA_LINK_FLAGS}")
   else()
     SET(CMAKE_LINK_FLAGS "${STR_EXTRA_LINK_FLAGS}")
   endif()
 endif()
 
-if(USE_OMP)
-  cmessage(FATAL_ERROR "No OMP features currently enabled so this is a FATAL_ERROR to let you know that you don't gain anything with this declaration.")
-endif()
-
-
 if (VERBOSE)
   cmessage (STATUS "C++ Compiler      : ${CXX_COMPILER_NAME}")
   cmessage (STATUS "    flags         : ${CMAKE_CXX_FLAGS}")
   cmessage (STATUS "    Release flags : ${CMAKE_CXX_FLAGS_RELEASE}")
   cmessage (STATUS "    Debug flags   : ${CMAKE_CXX_FLAGS_DEBUG}")
   cmessage (STATUS "    Link Flags    : ${CMAKE_LINK_FLAGS}")
   cmessage (STATUS "    Lib Flags     : ${CMAKE_DEPENDLIB_FLAGS}")
 endif()
diff --git a/cmake/cacheVariables.cmake b/cmake/cacheVariables.cmake
index 6ab9bb0..64ea088 100644
--- a/cmake/cacheVariables.cmake
+++ b/cmake/cacheVariables.cmake
@@ -1,220 +1,89 @@
-# Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+# Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    NUISANCE is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 function(CheckAndSetDefaultEnv VARNAME DEFAULT CACHETYPE DOCSTRING ENVNAME)
   #cmessage(DEBUG "Trying to assign variable ${VARNAME} into the cache.")
   if(NOT DEFINED ${VARNAME})
     if(DEFINED ENV{${ENVNAME}} AND NOT $ENV{${ENVNAME}} STREQUAL "")
       set(${VARNAME} $ENV{${ENVNAME}} CACHE ${CACHETYPE} ${DOCSTRING})
       cmessage(DEBUG "    Read ${VARNAME} from ENVVAR ${ENVNAME} as $ENV{${ENVNAME}}.")
     else()
       set(${VARNAME} ${DEFAULT} CACHE ${CACHETYPE} ${DOCSTRING})
     endif()
   else()
     set(${VARNAME} ${${VARNAME}} CACHE ${CACHETYPE} ${DOCSTRING})
     unset(${VARNAME})
   endif()
   cmessage(CACHE "--Set cache variable: \"${VARNAME}\" to \"${${VARNAME}}\", in cache ${CACHETYPE}.")
 endfunction()
 
 function(CheckAndSetDefaultCache VARNAME DEFAULT CACHETYPE DOCSTRING)
 #  cmessage(DEBUG "Trying to assign variable ${VARNAME} into the cache.")
   if(NOT DEFINED ${VARNAME})
     set(${VARNAME} ${DEFAULT} CACHE ${CACHETYPE} ${DOCSTRING})
   else()
     set(${VARNAME} ${${VARNAME}} CACHE ${CACHETYPE} ${DOCSTRING})
     unset(${VARNAME})
   endif()
   cmessage(CACHE "--Set cache variable: \"${VARNAME}\" to \"${${VARNAME}}\", in cache ${CACHETYPE}.")
 endfunction()
 
 function(CheckAndSetDefault VARNAME DEFAULT)
 #  cmessage(DEBUG "Trying to assign variable ${VARNAME}.")
   if(NOT DEFINED ${VARNAME})
     set(${VARNAME} ${DEFAULT} PARENT_SCOPE)
     set(${VARNAME} ${DEFAULT})
   endif()
   cmessage(CACHE "--Set variable: \"${VARNAME}\" to \"${${VARNAME}}\".")
 endfunction()
 
 CheckAndSetDefaultCache(VERBOSE TRUE BOOL "Whether to configure loudly.")
 
 set (CMAKE_SKIP_BUILD_RPATH TRUE)
 
 #Changes default install path to be a subdirectory of the build dir.
 #Can set build dir at configure time with -DCMAKE_INSTALL_PREFIX=/install/path
 if(CMAKE_INSTALL_PREFIX STREQUAL "" OR CMAKE_INSTALL_PREFIX STREQUAL
   "/usr/local")
   set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}")
 elseif(NOT DEFINED CMAKE_INSTALL_PREFIX)
   set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}")
 endif()
 
 if(CMAKE_BUILD_TYPE STREQUAL "")
   set(CMAKE_BUILD_TYPE DEBUG)
 elseif(NOT DEFINED CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE DEBUG)
 endif()
 
 CheckAndSetDefaultCache(EXTRA_SETUP_SCRIPT "" PATH "The path to an extra script to inject into the NUISANCE setup script. <>")
 
 CheckAndSetDefaultCache(USE_MINIMIZER TRUE INTERNAL "Whether we are using the ROOT minimization libraries. <TRUE>")
 
 CheckAndSetDefaultCache(USE_ROOT6 FALSE INTERNAL "Whether we are using the ROOT 6. <FALSE>")
 
-CheckAndSetDefaultCache(USE_HEPMC FALSE BOOL "Whether to enable HepMC input support. <FALSE>")
-CheckAndSetDefaultEnv(HEPMC "" PATH "Path to HepMC source tree root directory. Overrides environment variable \$HEPMC <>" HEPMC)
-CheckAndSetDefaultCache(HEPMC_MOMUNIT "GEV" STRING "HepMC momentum units [MEV|GEV]. <GEV>")
-CheckAndSetDefaultCache(HEPMC_LENUNIT "CM" STRING "HepMC momentum units [MM|CM]. <CM>")
-CheckAndSetDefaultCache(HEPMC_USED_EP FALSE INTERNAL "Whether we built HepMC or not. <FALSE>")
-
-CheckAndSetDefaultCache(USE_NEUT FALSE BOOL "Whether to enable NEUT (reweight) support. Requires external libraries. <FALSE>")
-CheckAndSetDefaultCache(IS_NEUT_54 FALSE BOOL "Whether to enabled NEUT is version 5.4 or greater. <FALSE>")
-CheckAndSetDefaultEnv(NEUT_ROOT "" PATH "Path to NEUT source tree root directory. Overrides environment variable \$NEUT_ROOT <>" NEUT_ROOT)
-CheckAndSetDefaultEnv(CERN "" PATH "Path to CERNLIB source tree root directory that NEUT was built against. Overrides environment variable \$CERN <>" CERN)
-CheckAndSetDefaultEnv(CERN_LEVEL "" STRING "CERNLIB Library version. Overrides environment variable \$CERN_LEVEL <>" CERN_LEVEL)
-
 CheckAndSetDefaultCache(USE_NuWro FALSE BOOL "Whether to enable NuWro support. <FALSE>")
 CheckAndSetDefaultEnv(NUWRO "" PATH "Path to NuWro source tree root directory. Overrides environment variable \$NUWRO <>" NUWRO)
 CheckAndSetDefaultEnv(NUWRO_INC "" PATH "Path to NuWro installed includes directory, needs to contain \"params_all.h\". Overrides environment variable \$NUWRO_INC <>" NUWRO_INC)
-CheckAndSetDefaultCache(NUWRO_INPUT_FILE "" FILEPATH "Path to an input NuWro event vector, which can be used to build NuWro i/o libraries. <>")
-CheckAndSetDefaultCache(NUWRO_BUILT_FROM_FILE FALSE INTERNAL "Whether the NuWro libraries were built by NUISANCE. <FALSE>")
-CheckAndSetDefaultCache(USE_NuWro_RW FALSE BOOL "Whether to try and build support for NuWro reweighting. <FALSE>")
-CheckAndSetDefaultCache(USE_NuWro_SRW_Event FALSE BOOL "Whether to use cut down NuWro reweight event format. Requires NuWro reweight. <FALSE>")
-
-CheckAndSetDefaultCache(USE_GENIE FALSE BOOL "Whether to enable GENIE (reweight) support. Requires external libraries. <FALSE>")
-CheckAndSetDefaultCache(GENIE_VERSION "AUTO" STRING "GENIE Version <AUTO>")
-CheckAndSetDefaultEnv(GENIE "" PATH "Path to GENIE source tree root directory. Overrides environment variable \$GENIE <>" GENIE)
-CheckAndSetDefaultEnv(LHAPDF_LIB "" PATH "Path to pre-built LHAPDF libraries. Overrides environment variable \$LHAPDF_LIB. <>" LHAPDF_LIB)
-CheckAndSetDefaultEnv(LHAPDF_INC "" PATH "Path to installed LHAPDF headers. Overrides environment variable \$LHAPDF_INC. <>" LHAPDF_INC)
-CheckAndSetDefaultEnv(LHAPATH "" PATH "Path to LHA PDF inputs. Overrides environment variable \$LHAPATH. <>" LHAPATH)
-CheckAndSetDefaultEnv(LIBXML2_LIB "" PATH "Path to pre-built LIBXML2 libraries. Overrides environment variable \$LIBXML2_LIB. <>" LIBXML2_LIB)
-CheckAndSetDefaultEnv(LIBXML2_INC "" PATH "Path to installed LIBXML2 headers. Overrides environment variable \$LIBXML2_INC. <>" LIBXML2_INC)
-CheckAndSetDefaultEnv(LOG4CPP_LIB "" PATH "Path to pre-built LOG4CPP libraries. Overrides environment variable \$LOG4CPP_LIB. <>" LOG4CPP_LIB)
-CheckAndSetDefaultEnv(LOG4CPP_INC "" PATH "Path to installed LOG4CPP headers. Overrides environment variable \$LOG4CPP_INC. <>" LOG4CPP_INC)
-
-CheckAndSetDefaultCache(BUILD_GEVGEN FALSE BOOL "Whether to build nuisance_gevgen app.")
-
-CheckAndSetDefaultCache(USE_T2K FALSE BOOL "Whether to enable T2KReWeight support. Requires external libraries. <FALSE>")
-CheckAndSetDefaultEnv(T2KREWEIGHT "" PATH "Path to installed T2KREWEIGHTReWeight. Overrides environment variable \$T2KREWEIGHT. <>" T2KREWEIGHT)
-
-CheckAndSetDefaultCache(USE_NIWG FALSE BOOL "Whether to enable (T2K) NIWG ReWeight support. Requires external libraries. <FALSE>")
-CheckAndSetDefaultEnv(NIWG_ROOT "" PATH "Path to installed NIWGReWeight. Overrides environment variable \$NIWG. <>" NIWG)
-
-CheckAndSetDefaultCache(USE_DUNERWT FALSE BOOL "Whether to enable DUNE ReWeight support. Requires external libraries. <FALSE>")
-CheckAndSetDefaultEnv(NUSYST_ROOT "" PATH "Path to installed NuSystematics. Overrides environment variable \$NUSYST_ROOT. <>" DUNERWT_ROOT)
-CheckAndSetDefaultEnv(SYSTTOOLS_ROOT "" PATH "Path to installed ART Systematics Tools. Overrides environment variable \$SYSTTOOLS_ROOT. <>" SYSTTOOLS_ROOT)
-
-CheckAndSetDefaultCache(USE_MINERvA_RW FALSE BOOL "Whether to enable MINERvA ReWeight support. <FALSE>")
 
 CheckAndSetDefaultEnv(PYTHIA6 "" PATH "Path to directory containing libPythia6.so. Overrides environment variable \$PYTHIA6 <>" PYTHIA6)
-
-CheckAndSetDefaultEnv(PYTHIA8 "" PATH "Path to directory containing libPythia8.so. Overrides environment variable \$PYTHIA8 <>" PYTHIA8)
-CheckAndSetDefaultCache(USE_PYTHIA8 FALSE BOOL "Whether to enable PYTHIA8 event support. <FALSE>")
-
-CheckAndSetDefaultCache(USE_GiBUU TRUE BOOL "Whether to enable GiBUU event support. <TRUE>")
-CheckAndSetDefaultCache(BUILD_GiBUU FALSE BOOL "Whether to build supporting GiBUU event tools along with a patched version of GiBUU. <FALSE>")
-
-CheckAndSetDefaultCache(USE_NUANCE TRUE BOOL "Whether to enable NUANCE event support. <TRUE>")
-
-CheckAndSetDefaultCache(USE_PROB3PP FALSE BOOL "Whether to download and compile in Prob3++ support. <FALSE>")
-
-CheckAndSetDefaultCache(NO_EXTERNAL_UPDATE FALSE BOOL "Whether to perform the update target for external dependencies. Note this may produce errors for CMake < 3.8 where a bug was fixed for the feature that this option invokes. <FALSE>")
-
-CheckAndSetDefaultCache(USE_GPERFTOOLS FALSE BOOL "Whether to compile in google performance tools. <FALSE>")
-
 CheckAndSetDefault(NEED_PYTHIA6 FALSE)
-CheckAndSetDefault(NEED_PYTHIA8 FALSE)
 
 CheckAndSetDefault(NEED_ROOTEVEGEN FALSE)
 CheckAndSetDefault(NEED_ROOTPYTHIA6 FALSE)
-
-CheckAndSetDefaultCache(USE_OMP FALSE BOOL "Whether to enable multicore features (there currently are none...). <FALSE>")
-
-CheckAndSetDefaultCache(USE_DYNSAMPLES TRUE BOOL "Whether to enable the dynamic sample loader. <TRUE>")
-
-CheckAndSetDefault(NO_EXPERIMENTS FALSE)
-
-cmessage(STATUS "NO_EXPERIMENTS: ${NO_EXPERIMENTS}")
-
-CheckAndSetDefaultCache(NO_ANL ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build ANL samples. <-DNO_EXPERIMENTS=FALSE>")
-CheckAndSetDefaultCache(NO_ArgoNeuT ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build ArgoNeuT samples. <-DNO_EXPERIMENTS=FALSE>")
-CheckAndSetDefaultCache(NO_BEBC ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build BEBC samples. <-DNO_EXPERIMENTS=FALSE>")
-CheckAndSetDefaultCache(NO_BNL ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build BNL samples. <-DNO_EXPERIMENTS=FALSE>")
-CheckAndSetDefaultCache(NO_FNAL ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build FNAL samples. <-DNO_EXPERIMENTS=FALSE>")
-CheckAndSetDefaultCache(NO_GGM ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build GGM samples. <-DNO_EXPERIMENTS=FALSE>")
-CheckAndSetDefaultCache(NO_K2K ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build K2K samples. <-DNO_EXPERIMENTS=FALSE>")
-CheckAndSetDefaultCache(NO_MINERvA ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build MINERvA samples. <-DNO_EXPERIMENTS=FALSE>")
-CheckAndSetDefaultCache(NO_MiniBooNE ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build MiniBooNE samples. <-DNO_EXPERIMENTS=FALSE>")
-CheckAndSetDefaultCache(NO_T2K ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build T2K samples. <-DNO_EXPERIMENTS=FALSE>")
-CheckAndSetDefaultCache(NO_SciBooNE ${NO_EXPERIMENTS} BOOL "Whether to *NOT* build SciBooNE samples. <-DNO_EXPERIMENTS=FALSE>")
-
-
-function(SAYVARS)
-
-LIST(APPEND VARS
-  USE_HEPMC
-  HEPMC
-  HEPMC_MOMUNIT
-  HEPMC_LENUNIT
-  HEPMC_USED_EP
-  USE_NEUT
-  NEUT_ROOT
-  CERN
-  CERN_LEVEL
-  USE_NuWro
-  NUWRO
-  NUWRO_INC
-  NUWRO_INPUT_FILE
-  NUWRO_BUILT_FROM_FILE
-  USE_GENIE
-  GENIE
-  LHAPDF_LIB
-  LHAPDF_INC
-  LIBXML2_LIB
-  LIBXML2_INC
-  LOG4CPP_LIB
-  GENIE_LOG4CPP_INC
-  BUILD_GEVGEN
-  USE_T2K
-  USE_NIWG
-  USE_GiBUU
-  BUILD_GiBUU
-  USE_NUANCE
-  NO_EXTERNAL_UPDATE
-  USE_GPERFTOOLS
-  NO_ANL
-  NO_ArgoNeuT
-  NO_BEBC
-  NO_BNL
-  NO_FNAL
-  NO_GGM
-  NO_K2K
-  NO_MINERvA
-  NO_MiniBooNE
-  NO_T2K
-  NO_SciBooNE)
-
-  foreach(v ${VARS})
-    if(DEFINED ${v})
-      cmessage(DEBUG "VARIABLE: \"${v}\" = \"${${v}}\"")
-    endif()
-  endforeach(v)
-
-endfunction()
diff --git a/cmake/fhiclcppSetup.cmake b/cmake/fhiclcppSetup.cmake
new file mode 100644
index 0000000..4af68fe
--- /dev/null
+++ b/cmake/fhiclcppSetup.cmake
@@ -0,0 +1,16 @@
+###### FHICL set up
+include(ExternalProject)
+
+ExternalProject_Add(fhiclcpp-simple
+  PREFIX "${PROJECT_BINARY_DIR}/fhiclcpp-simple"
+  GIT_REPOSITORY https://github.com/luketpickering/fhiclcpp-simple.git
+  GIT_TAG stable
+  UPDATE_DISCONNECTED 1
+  CMAKE_ARGS
+  -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+  -DSETUPFILENAME=fhiclcpp.setup.sh)
+
+LIST(APPEND EXTRA_CXX_FLAGS -I${CMAKE_INSTALL_PREFIX}/include)
diff --git a/cmake/BinBlobSetup.header b/cmake_old/BinBlobSetup.header
similarity index 100%
rename from cmake/BinBlobSetup.header
rename to cmake_old/BinBlobSetup.header
diff --git a/cmake/BuildDynamicSample.in b/cmake_old/BuildDynamicSample.in
similarity index 100%
rename from cmake/BuildDynamicSample.in
rename to cmake_old/BuildDynamicSample.in
diff --git a/cmake/BuildDynamicSmearcepter.in b/cmake_old/BuildDynamicSmearcepter.in
similarity index 100%
rename from cmake/BuildDynamicSmearcepter.in
rename to cmake_old/BuildDynamicSmearcepter.in
diff --git a/cmake/DUNERwtSetup.cmake b/cmake_old/DUNERwtSetup.cmake
similarity index 100%
rename from cmake/DUNERwtSetup.cmake
rename to cmake_old/DUNERwtSetup.cmake
diff --git a/cmake/GENIESetup.cmake b/cmake_old/GENIESetup.cmake
similarity index 100%
rename from cmake/GENIESetup.cmake
rename to cmake_old/GENIESetup.cmake
diff --git a/cmake/GiBUUSetup.cmake b/cmake_old/GiBUUSetup.cmake
similarity index 100%
rename from cmake/GiBUUSetup.cmake
rename to cmake_old/GiBUUSetup.cmake
diff --git a/cmake/HepMC.cmake b/cmake_old/HepMC.cmake
similarity index 100%
rename from cmake/HepMC.cmake
rename to cmake_old/HepMC.cmake
diff --git a/cmake/MINERvASetup.cmake b/cmake_old/MINERvASetup.cmake
similarity index 100%
rename from cmake/MINERvASetup.cmake
rename to cmake_old/MINERvASetup.cmake
diff --git a/cmake/MakeBinaryBlob.in b/cmake_old/MakeBinaryBlob.in
similarity index 100%
rename from cmake/MakeBinaryBlob.in
rename to cmake_old/MakeBinaryBlob.in
diff --git a/cmake/NEUTSetup.cmake b/cmake_old/NEUTSetup.cmake
similarity index 100%
rename from cmake/NEUTSetup.cmake
rename to cmake_old/NEUTSetup.cmake
diff --git a/cmake/NIWGSetup.cmake b/cmake_old/NIWGSetup.cmake
similarity index 100%
rename from cmake/NIWGSetup.cmake
rename to cmake_old/NIWGSetup.cmake
diff --git a/cmake/NuWroSetup.cmake b/cmake_old/NuWroSetup.cmake
similarity index 100%
copy from cmake/NuWroSetup.cmake
copy to cmake_old/NuWroSetup.cmake
diff --git a/cmake/Prob3++Setup.cmake b/cmake_old/Prob3++Setup.cmake
similarity index 100%
rename from cmake/Prob3++Setup.cmake
rename to cmake_old/Prob3++Setup.cmake
diff --git a/cmake/ROOTSetup.cmake b/cmake_old/ROOTSetup.cmake
similarity index 100%
copy from cmake/ROOTSetup.cmake
copy to cmake_old/ROOTSetup.cmake
diff --git a/cmake/ReweightEnginesSetup.cmake b/cmake_old/ReweightEnginesSetup.cmake
similarity index 100%
rename from cmake/ReweightEnginesSetup.cmake
rename to cmake_old/ReweightEnginesSetup.cmake
diff --git a/cmake/T2KSetup.cmake b/cmake_old/T2KSetup.cmake
similarity index 100%
rename from cmake/T2KSetup.cmake
rename to cmake_old/T2KSetup.cmake
diff --git a/cmake/c++CompilerSetup.cmake b/cmake_old/c++CompilerSetup.cmake
similarity index 100%
copy from cmake/c++CompilerSetup.cmake
copy to cmake_old/c++CompilerSetup.cmake
diff --git a/cmake/cacheVariables.cmake b/cmake_old/cacheVariables.cmake
similarity index 100%
copy from cmake/cacheVariables.cmake
copy to cmake_old/cacheVariables.cmake
diff --git a/cmake_old/cmessage.cmake b/cmake_old/cmessage.cmake
new file mode 100644
index 0000000..deba23a
--- /dev/null
+++ b/cmake_old/cmessage.cmake
@@ -0,0 +1,48 @@
+if(NOT WIN32)
+  string(ASCII 27 Esc)
+  set(CM_ColourReset "${Esc}[m")
+  set(CM_ColourBold "${Esc}[1m")
+  set(CM_Red "${Esc}[31m")
+  set(CM_Green "${Esc}[32m")
+  set(CM_Yellow "${Esc}[33m")
+  set(CM_Blue "${Esc}[34m")
+  set(CM_Magenta "${Esc}[35m")
+  set(CM_Cyan "${Esc}[36m")
+  set(CM_White "${Esc}[37m")
+  set(CM_BoldRed "${Esc}[1;31m")
+  set(CM_BoldGreen "${Esc}[1;32m")
+  set(CM_BoldYellow "${Esc}[1;33m")
+  set(CM_BoldBlue "${Esc}[1;34m")
+  set(CM_BoldMagenta "${Esc}[1;35m")
+  set(CM_BoldCyan "${Esc}[1;36m")
+  set(CM_BoldWhite "${Esc}[1;37m")
+endif()
+
+message(STATUS "Setting up colored messages...")
+
+function(cmessage)
+  list(GET ARGV 0 MessageType)
+  if(MessageType STREQUAL FATAL_ERROR OR MessageType STREQUAL SEND_ERROR)
+    list(REMOVE_AT ARGV 0)
+    message(${MessageType} "${CM_BoldRed}${ARGV}${CM_ColourReset}")
+  elseif(MessageType STREQUAL WARNING)
+    list(REMOVE_AT ARGV 0)
+    message(${MessageType} "${CM_BoldYellow}${ARGV}${CM_ColourReset}")
+  elseif(MessageType STREQUAL AUTHOR_WARNING)
+    list(REMOVE_AT ARGV 0)
+    message(${MessageType} "${CM_BoldCyan}${ARGV}${CM_ColourReset}")
+  elseif(MessageType STREQUAL STATUS)
+    list(REMOVE_AT ARGV 0)
+    message(${MessageType} "${CM_Green}[INFO]:${CM_ColourReset} ${ARGV}")
+  elseif(MessageType STREQUAL CACHE)				
+    list(REMOVE_AT ARGV 0)
+    message(-- "${CM_Blue}[CACHE]:${CM_ColourReset} ${ARGV}")
+  elseif(MessageType STREQUAL DEBUG)
+    list(REMOVE_AT ARGV 0)
+    if(BUILD_DEBUG_MSGS)
+      message("${CM_Magenta}[DEBUG]:${CM_ColourReset} ${ARGV}")
+    endif()
+  else()
+    message(${MessageType} "${CM_Green}[INFO]:${CM_ColourReset} ${ARGV}")
+  endif()
+endfunction()
diff --git a/cmake/docsSetup.cmake b/cmake_old/docsSetup.cmake
similarity index 100%
rename from cmake/docsSetup.cmake
rename to cmake_old/docsSetup.cmake
diff --git a/cmake/getgenieversion.sh b/cmake_old/getgenieversion.sh
similarity index 100%
rename from cmake/getgenieversion.sh
rename to cmake_old/getgenieversion.sh
diff --git a/cmake/gperfSetup.cmake b/cmake_old/gperfSetup.cmake
similarity index 100%
rename from cmake/gperfSetup.cmake
rename to cmake_old/gperfSetup.cmake
diff --git a/cmake/pythia8Setup.cmake b/cmake_old/pythia6Setup.cmake
similarity index 74%
copy from cmake/pythia8Setup.cmake
copy to cmake_old/pythia6Setup.cmake
index d46002d..012fa34 100644
--- a/cmake/pythia8Setup.cmake
+++ b/cmake_old/pythia6Setup.cmake
@@ -1,30 +1,31 @@
 # Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    NUISANCE is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-if(NEED_PYTHIA8)
-  if(PYTHIA8 STREQUAL "")
-    cmessage(FATAL_ERROR "Variable PYTHIA8 is not defined. This must be set to point to a prebuilt PYTHIA8 instance, please set the \$PYTHIA8 environment variable or configure with -DPYTHIA8=/path/to/pythia8.")
+if(NEED_PYTHIA6)
+  if(PYTHIA6 STREQUAL "")
+    cmessage(FATAL_ERROR "Variable PYTHIA6 is not defined. This must be set to point to a prebuilt PYTHIA6 instance, please set the \$PYTHIA6 environment variable or configure with -DPYTHIA6=/path/to/pythia6.")
   endif()
 
-  LIST(APPEND EXTRA_LINK_DIRS ${PYTHIA8})
+  LIST(APPEND EXTRA_LINK_DIRS ${PYTHIA6})
 
   LIST(REVERSE EXTRA_LIBS)
-  LIST(APPEND EXTRA_LIBS Pythia8 gfortran)
+  LIST(APPEND EXTRA_LIBS Pythia6 gfortran)
   LIST(REVERSE EXTRA_LIBS)
+
 endif()
diff --git a/cmake/pythia8Setup.cmake b/cmake_old/pythia8Setup.cmake
similarity index 100%
rename from cmake/pythia8Setup.cmake
rename to cmake_old/pythia8Setup.cmake
diff --git a/cmake/setup.sh.in b/cmake_old/setup.sh.in
similarity index 100%
rename from cmake/setup.sh.in
rename to cmake_old/setup.sh.in
diff --git a/src/ANL/ANL_CC1npip_Evt_1DQ2_nu.cxx b/old_src/ANL/ANL_CC1npip_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1npip_Evt_1DQ2_nu.cxx
rename to old_src/ANL/ANL_CC1npip_Evt_1DQ2_nu.cxx
diff --git a/src/ANL/ANL_CC1npip_Evt_1DQ2_nu.h b/old_src/ANL/ANL_CC1npip_Evt_1DQ2_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1npip_Evt_1DQ2_nu.h
rename to old_src/ANL/ANL_CC1npip_Evt_1DQ2_nu.h
diff --git a/src/ANL/ANL_CC1npip_Evt_1DcosmuStar_nu.cxx b/old_src/ANL/ANL_CC1npip_Evt_1DcosmuStar_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1npip_Evt_1DcosmuStar_nu.cxx
rename to old_src/ANL/ANL_CC1npip_Evt_1DcosmuStar_nu.cxx
diff --git a/src/ANL/ANL_CC1npip_Evt_1DcosmuStar_nu.h b/old_src/ANL/ANL_CC1npip_Evt_1DcosmuStar_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1npip_Evt_1DcosmuStar_nu.h
rename to old_src/ANL/ANL_CC1npip_Evt_1DcosmuStar_nu.h
diff --git a/src/ANL/ANL_CC1npip_Evt_1Dppi_nu.cxx b/old_src/ANL/ANL_CC1npip_Evt_1Dppi_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1npip_Evt_1Dppi_nu.cxx
rename to old_src/ANL/ANL_CC1npip_Evt_1Dppi_nu.cxx
diff --git a/src/ANL/ANL_CC1npip_Evt_1Dppi_nu.h b/old_src/ANL/ANL_CC1npip_Evt_1Dppi_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1npip_Evt_1Dppi_nu.h
rename to old_src/ANL/ANL_CC1npip_Evt_1Dppi_nu.h
diff --git a/src/ANL/ANL_CC1npip_XSec_1DEnu_nu.cxx b/old_src/ANL/ANL_CC1npip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1npip_XSec_1DEnu_nu.cxx
rename to old_src/ANL/ANL_CC1npip_XSec_1DEnu_nu.cxx
diff --git a/src/ANL/ANL_CC1npip_XSec_1DEnu_nu.h b/old_src/ANL/ANL_CC1npip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1npip_XSec_1DEnu_nu.h
rename to old_src/ANL/ANL_CC1npip_XSec_1DEnu_nu.h
diff --git a/src/ANL/ANL_CC1pi0_Evt_1DQ2_nu.cxx b/old_src/ANL/ANL_CC1pi0_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1pi0_Evt_1DQ2_nu.cxx
rename to old_src/ANL/ANL_CC1pi0_Evt_1DQ2_nu.cxx
diff --git a/src/ANL/ANL_CC1pi0_Evt_1DQ2_nu.h b/old_src/ANL/ANL_CC1pi0_Evt_1DQ2_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1pi0_Evt_1DQ2_nu.h
rename to old_src/ANL/ANL_CC1pi0_Evt_1DQ2_nu.h
diff --git a/src/ANL/ANL_CC1pi0_Evt_1DcosmuStar_nu.cxx b/old_src/ANL/ANL_CC1pi0_Evt_1DcosmuStar_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1pi0_Evt_1DcosmuStar_nu.cxx
rename to old_src/ANL/ANL_CC1pi0_Evt_1DcosmuStar_nu.cxx
diff --git a/src/ANL/ANL_CC1pi0_Evt_1DcosmuStar_nu.h b/old_src/ANL/ANL_CC1pi0_Evt_1DcosmuStar_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1pi0_Evt_1DcosmuStar_nu.h
rename to old_src/ANL/ANL_CC1pi0_Evt_1DcosmuStar_nu.h
diff --git a/src/ANL/ANL_CC1pi0_XSec_1DEnu_nu.cxx b/old_src/ANL/ANL_CC1pi0_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1pi0_XSec_1DEnu_nu.cxx
rename to old_src/ANL/ANL_CC1pi0_XSec_1DEnu_nu.cxx
diff --git a/src/ANL/ANL_CC1pi0_XSec_1DEnu_nu.h b/old_src/ANL/ANL_CC1pi0_XSec_1DEnu_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1pi0_XSec_1DEnu_nu.h
rename to old_src/ANL/ANL_CC1pi0_XSec_1DEnu_nu.h
diff --git a/src/ANL/ANL_CC1ppip_Evt_1DQ2_nu.cxx b/old_src/ANL/ANL_CC1ppip_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1DQ2_nu.cxx
rename to old_src/ANL/ANL_CC1ppip_Evt_1DQ2_nu.cxx
diff --git a/src/ANL/ANL_CC1ppip_Evt_1DQ2_nu.h b/old_src/ANL/ANL_CC1ppip_Evt_1DQ2_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1DQ2_nu.h
rename to old_src/ANL/ANL_CC1ppip_Evt_1DQ2_nu.h
diff --git a/src/ANL/ANL_CC1ppip_Evt_1DcosmuStar_nu.cxx b/old_src/ANL/ANL_CC1ppip_Evt_1DcosmuStar_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1DcosmuStar_nu.cxx
rename to old_src/ANL/ANL_CC1ppip_Evt_1DcosmuStar_nu.cxx
diff --git a/src/ANL/ANL_CC1ppip_Evt_1DcosmuStar_nu.h b/old_src/ANL/ANL_CC1ppip_Evt_1DcosmuStar_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1DcosmuStar_nu.h
rename to old_src/ANL/ANL_CC1ppip_Evt_1DcosmuStar_nu.h
diff --git a/src/ANL/ANL_CC1ppip_Evt_1DcosthAdler_nu.cxx b/old_src/ANL/ANL_CC1ppip_Evt_1DcosthAdler_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1DcosthAdler_nu.cxx
rename to old_src/ANL/ANL_CC1ppip_Evt_1DcosthAdler_nu.cxx
diff --git a/src/ANL/ANL_CC1ppip_Evt_1DcosthAdler_nu.h b/old_src/ANL/ANL_CC1ppip_Evt_1DcosthAdler_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1DcosthAdler_nu.h
rename to old_src/ANL/ANL_CC1ppip_Evt_1DcosthAdler_nu.h
diff --git a/src/ANL/ANL_CC1ppip_Evt_1Dphi_nu.cxx b/old_src/ANL/ANL_CC1ppip_Evt_1Dphi_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1Dphi_nu.cxx
rename to old_src/ANL/ANL_CC1ppip_Evt_1Dphi_nu.cxx
diff --git a/src/ANL/ANL_CC1ppip_Evt_1Dphi_nu.h b/old_src/ANL/ANL_CC1ppip_Evt_1Dphi_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1Dphi_nu.h
rename to old_src/ANL/ANL_CC1ppip_Evt_1Dphi_nu.h
diff --git a/src/ANL/ANL_CC1ppip_Evt_1Dppi_nu.cxx b/old_src/ANL/ANL_CC1ppip_Evt_1Dppi_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1Dppi_nu.cxx
rename to old_src/ANL/ANL_CC1ppip_Evt_1Dppi_nu.cxx
diff --git a/src/ANL/ANL_CC1ppip_Evt_1Dppi_nu.h b/old_src/ANL/ANL_CC1ppip_Evt_1Dppi_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1Dppi_nu.h
rename to old_src/ANL/ANL_CC1ppip_Evt_1Dppi_nu.h
diff --git a/src/ANL/ANL_CC1ppip_Evt_1Dthpr_nu.cxx b/old_src/ANL/ANL_CC1ppip_Evt_1Dthpr_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1Dthpr_nu.cxx
rename to old_src/ANL/ANL_CC1ppip_Evt_1Dthpr_nu.cxx
diff --git a/src/ANL/ANL_CC1ppip_Evt_1Dthpr_nu.h b/old_src/ANL/ANL_CC1ppip_Evt_1Dthpr_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1ppip_Evt_1Dthpr_nu.h
rename to old_src/ANL/ANL_CC1ppip_Evt_1Dthpr_nu.h
diff --git a/src/ANL/ANL_CC1ppip_XSec_1DEnu_nu.cxx b/old_src/ANL/ANL_CC1ppip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1ppip_XSec_1DEnu_nu.cxx
rename to old_src/ANL/ANL_CC1ppip_XSec_1DEnu_nu.cxx
diff --git a/src/ANL/ANL_CC1ppip_XSec_1DEnu_nu.h b/old_src/ANL/ANL_CC1ppip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1ppip_XSec_1DEnu_nu.h
rename to old_src/ANL/ANL_CC1ppip_XSec_1DEnu_nu.h
diff --git a/src/ANL/ANL_CC1ppip_XSec_1DQ2_nu.cxx b/old_src/ANL/ANL_CC1ppip_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC1ppip_XSec_1DQ2_nu.cxx
rename to old_src/ANL/ANL_CC1ppip_XSec_1DQ2_nu.cxx
diff --git a/src/ANL/ANL_CC1ppip_XSec_1DQ2_nu.h b/old_src/ANL/ANL_CC1ppip_XSec_1DQ2_nu.h
similarity index 100%
rename from src/ANL/ANL_CC1ppip_XSec_1DQ2_nu.h
rename to old_src/ANL/ANL_CC1ppip_XSec_1DQ2_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu.cxx b/old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu.h b/old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu.h
rename to old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppim_nu.cxx b/old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppim_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppim_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppim_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppim_nu.h b/old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppim_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppim_nu.h
rename to old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppim_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.cxx b/old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.h b/old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.h
rename to old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu.cxx b/old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu.h b/old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu.h
rename to old_src/ANL/ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pim1pip_XSec_1DEnu_nu.cxx b/old_src/ANL/ANL_CC2pi_1pim1pip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pim1pip_XSec_1DEnu_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pim1pip_XSec_1DEnu_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pim1pip_XSec_1DEnu_nu.h b/old_src/ANL/ANL_CC2pi_1pim1pip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pim1pip_XSec_1DEnu_nu.h
rename to old_src/ANL/ANL_CC2pi_1pim1pip_XSec_1DEnu_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu.cxx b/old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu.h b/old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu.h
rename to old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu.cxx b/old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu.h b/old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu.h
rename to old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu.cxx b/old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu.h b/old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu.h
rename to old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu.cxx b/old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu.h b/old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu.h
rename to old_src/ANL/ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu.cxx b/old_src/ANL/ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu.h b/old_src/ANL/ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu.h
rename to old_src/ANL/ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu.cxx b/old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu.h b/old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu.h
rename to old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu.cxx b/old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu.h b/old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu.h
rename to old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu.cxx b/old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu.h b/old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu.h
rename to old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu.cxx b/old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu.h b/old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu.h
rename to old_src/ANL/ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu.h
diff --git a/src/ANL/ANL_CC2pi_1pip1pip_XSec_1DEnu_nu.cxx b/old_src/ANL/ANL_CC2pi_1pip1pip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pip_XSec_1DEnu_nu.cxx
rename to old_src/ANL/ANL_CC2pi_1pip1pip_XSec_1DEnu_nu.cxx
diff --git a/src/ANL/ANL_CC2pi_1pip1pip_XSec_1DEnu_nu.h b/old_src/ANL/ANL_CC2pi_1pip1pip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/ANL/ANL_CC2pi_1pip1pip_XSec_1DEnu_nu.h
rename to old_src/ANL/ANL_CC2pi_1pip1pip_XSec_1DEnu_nu.h
diff --git a/src/ANL/ANL_CCQE_Evt_1DQ2_nu.cxx b/old_src/ANL/ANL_CCQE_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CCQE_Evt_1DQ2_nu.cxx
rename to old_src/ANL/ANL_CCQE_Evt_1DQ2_nu.cxx
diff --git a/src/ANL/ANL_CCQE_Evt_1DQ2_nu.h b/old_src/ANL/ANL_CCQE_Evt_1DQ2_nu.h
similarity index 100%
rename from src/ANL/ANL_CCQE_Evt_1DQ2_nu.h
rename to old_src/ANL/ANL_CCQE_Evt_1DQ2_nu.h
diff --git a/src/ANL/ANL_CCQE_XSec_1DEnu_nu.cxx b/old_src/ANL/ANL_CCQE_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_CCQE_XSec_1DEnu_nu.cxx
rename to old_src/ANL/ANL_CCQE_XSec_1DEnu_nu.cxx
diff --git a/src/ANL/ANL_CCQE_XSec_1DEnu_nu.h b/old_src/ANL/ANL_CCQE_XSec_1DEnu_nu.h
similarity index 100%
rename from src/ANL/ANL_CCQE_XSec_1DEnu_nu.h
rename to old_src/ANL/ANL_CCQE_XSec_1DEnu_nu.h
diff --git a/src/ANL/ANL_NC1npip_Evt_1Dppi_nu.cxx b/old_src/ANL/ANL_NC1npip_Evt_1Dppi_nu.cxx
similarity index 100%
rename from src/ANL/ANL_NC1npip_Evt_1Dppi_nu.cxx
rename to old_src/ANL/ANL_NC1npip_Evt_1Dppi_nu.cxx
diff --git a/src/ANL/ANL_NC1npip_Evt_1Dppi_nu.h b/old_src/ANL/ANL_NC1npip_Evt_1Dppi_nu.h
similarity index 100%
rename from src/ANL/ANL_NC1npip_Evt_1Dppi_nu.h
rename to old_src/ANL/ANL_NC1npip_Evt_1Dppi_nu.h
diff --git a/src/ANL/ANL_NC1ppim_Evt_1DcosmuStar_nu.cxx b/old_src/ANL/ANL_NC1ppim_Evt_1DcosmuStar_nu.cxx
similarity index 100%
rename from src/ANL/ANL_NC1ppim_Evt_1DcosmuStar_nu.cxx
rename to old_src/ANL/ANL_NC1ppim_Evt_1DcosmuStar_nu.cxx
diff --git a/src/ANL/ANL_NC1ppim_Evt_1DcosmuStar_nu.h b/old_src/ANL/ANL_NC1ppim_Evt_1DcosmuStar_nu.h
similarity index 100%
rename from src/ANL/ANL_NC1ppim_Evt_1DcosmuStar_nu.h
rename to old_src/ANL/ANL_NC1ppim_Evt_1DcosmuStar_nu.h
diff --git a/src/ANL/ANL_NC1ppim_XSec_1DEnu_nu.cxx b/old_src/ANL/ANL_NC1ppim_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/ANL/ANL_NC1ppim_XSec_1DEnu_nu.cxx
rename to old_src/ANL/ANL_NC1ppim_XSec_1DEnu_nu.cxx
diff --git a/src/ANL/ANL_NC1ppim_XSec_1DEnu_nu.h b/old_src/ANL/ANL_NC1ppim_XSec_1DEnu_nu.h
similarity index 100%
rename from src/ANL/ANL_NC1ppim_XSec_1DEnu_nu.h
rename to old_src/ANL/ANL_NC1ppim_XSec_1DEnu_nu.h
diff --git a/src/ANL/CMakeLists.txt b/old_src/ANL/CMakeLists.txt
similarity index 100%
rename from src/ANL/CMakeLists.txt
rename to old_src/ANL/CMakeLists.txt
diff --git a/src/ANL/SAMPLEREADME b/old_src/ANL/SAMPLEREADME
similarity index 100%
rename from src/ANL/SAMPLEREADME
rename to old_src/ANL/SAMPLEREADME
diff --git a/src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_antinu.cxx b/old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_antinu.cxx
similarity index 100%
rename from src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_antinu.cxx
rename to old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_antinu.cxx
diff --git a/src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_antinu.h b/old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_antinu.h
similarity index 100%
rename from src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_antinu.h
rename to old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_antinu.h
diff --git a/src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx b/old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx
similarity index 100%
rename from src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx
rename to old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_nu.cxx
diff --git a/src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_nu.h b/old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_nu.h
similarity index 100%
rename from src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_nu.h
rename to old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dpmu_nu.h
diff --git a/src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_antinu.cxx b/old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_antinu.cxx
similarity index 100%
rename from src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_antinu.cxx
rename to old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_antinu.cxx
diff --git a/src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_antinu.h b/old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_antinu.h
similarity index 100%
rename from src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_antinu.h
rename to old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_antinu.h
diff --git a/src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_nu.cxx b/old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_nu.cxx
similarity index 100%
rename from src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_nu.cxx
rename to old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_nu.cxx
diff --git a/src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_nu.h b/old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_nu.h
similarity index 100%
rename from src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_nu.h
rename to old_src/ArgoNeuT/ArgoNeuT_CCInc_XSec_1Dthetamu_nu.h
diff --git a/src/ArgoNeuT/CMakeLists.txt b/old_src/ArgoNeuT/CMakeLists.txt
similarity index 100%
rename from src/ArgoNeuT/CMakeLists.txt
rename to old_src/ArgoNeuT/CMakeLists.txt
diff --git a/src/BEBC/BEBC_CC1npim_XSec_1DEnu_antinu.cxx b/old_src/BEBC/BEBC_CC1npim_XSec_1DEnu_antinu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CC1npim_XSec_1DEnu_antinu.cxx
rename to old_src/BEBC/BEBC_CC1npim_XSec_1DEnu_antinu.cxx
diff --git a/src/BEBC/BEBC_CC1npim_XSec_1DEnu_antinu.h b/old_src/BEBC/BEBC_CC1npim_XSec_1DEnu_antinu.h
similarity index 100%
rename from src/BEBC/BEBC_CC1npim_XSec_1DEnu_antinu.h
rename to old_src/BEBC/BEBC_CC1npim_XSec_1DEnu_antinu.h
diff --git a/src/BEBC/BEBC_CC1npim_XSec_1DQ2_antinu.cxx b/old_src/BEBC/BEBC_CC1npim_XSec_1DQ2_antinu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CC1npim_XSec_1DQ2_antinu.cxx
rename to old_src/BEBC/BEBC_CC1npim_XSec_1DQ2_antinu.cxx
diff --git a/src/BEBC/BEBC_CC1npim_XSec_1DQ2_antinu.h b/old_src/BEBC/BEBC_CC1npim_XSec_1DQ2_antinu.h
similarity index 100%
rename from src/BEBC/BEBC_CC1npim_XSec_1DQ2_antinu.h
rename to old_src/BEBC/BEBC_CC1npim_XSec_1DQ2_antinu.h
diff --git a/src/BEBC/BEBC_CC1npip_XSec_1DEnu_nu.cxx b/old_src/BEBC/BEBC_CC1npip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CC1npip_XSec_1DEnu_nu.cxx
rename to old_src/BEBC/BEBC_CC1npip_XSec_1DEnu_nu.cxx
diff --git a/src/BEBC/BEBC_CC1npip_XSec_1DEnu_nu.h b/old_src/BEBC/BEBC_CC1npip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/BEBC/BEBC_CC1npip_XSec_1DEnu_nu.h
rename to old_src/BEBC/BEBC_CC1npip_XSec_1DEnu_nu.h
diff --git a/src/BEBC/BEBC_CC1npip_XSec_1DQ2_nu.cxx b/old_src/BEBC/BEBC_CC1npip_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CC1npip_XSec_1DQ2_nu.cxx
rename to old_src/BEBC/BEBC_CC1npip_XSec_1DQ2_nu.cxx
diff --git a/src/BEBC/BEBC_CC1npip_XSec_1DQ2_nu.h b/old_src/BEBC/BEBC_CC1npip_XSec_1DQ2_nu.h
similarity index 100%
rename from src/BEBC/BEBC_CC1npip_XSec_1DQ2_nu.h
rename to old_src/BEBC/BEBC_CC1npip_XSec_1DQ2_nu.h
diff --git a/src/BEBC/BEBC_CC1pi0_XSec_1DEnu_nu.cxx b/old_src/BEBC/BEBC_CC1pi0_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CC1pi0_XSec_1DEnu_nu.cxx
rename to old_src/BEBC/BEBC_CC1pi0_XSec_1DEnu_nu.cxx
diff --git a/src/BEBC/BEBC_CC1pi0_XSec_1DEnu_nu.h b/old_src/BEBC/BEBC_CC1pi0_XSec_1DEnu_nu.h
similarity index 100%
rename from src/BEBC/BEBC_CC1pi0_XSec_1DEnu_nu.h
rename to old_src/BEBC/BEBC_CC1pi0_XSec_1DEnu_nu.h
diff --git a/src/BEBC/BEBC_CC1pi0_XSec_1DQ2_nu.cxx b/old_src/BEBC/BEBC_CC1pi0_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CC1pi0_XSec_1DQ2_nu.cxx
rename to old_src/BEBC/BEBC_CC1pi0_XSec_1DQ2_nu.cxx
diff --git a/src/BEBC/BEBC_CC1pi0_XSec_1DQ2_nu.h b/old_src/BEBC/BEBC_CC1pi0_XSec_1DQ2_nu.h
similarity index 100%
rename from src/BEBC/BEBC_CC1pi0_XSec_1DQ2_nu.h
rename to old_src/BEBC/BEBC_CC1pi0_XSec_1DQ2_nu.h
diff --git a/src/BEBC/BEBC_CC1ppim_XSec_1DEnu_antinu.cxx b/old_src/BEBC/BEBC_CC1ppim_XSec_1DEnu_antinu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CC1ppim_XSec_1DEnu_antinu.cxx
rename to old_src/BEBC/BEBC_CC1ppim_XSec_1DEnu_antinu.cxx
diff --git a/src/BEBC/BEBC_CC1ppim_XSec_1DEnu_antinu.h b/old_src/BEBC/BEBC_CC1ppim_XSec_1DEnu_antinu.h
similarity index 100%
rename from src/BEBC/BEBC_CC1ppim_XSec_1DEnu_antinu.h
rename to old_src/BEBC/BEBC_CC1ppim_XSec_1DEnu_antinu.h
diff --git a/src/BEBC/BEBC_CC1ppim_XSec_1DQ2_antinu.cxx b/old_src/BEBC/BEBC_CC1ppim_XSec_1DQ2_antinu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CC1ppim_XSec_1DQ2_antinu.cxx
rename to old_src/BEBC/BEBC_CC1ppim_XSec_1DQ2_antinu.cxx
diff --git a/src/BEBC/BEBC_CC1ppim_XSec_1DQ2_antinu.h b/old_src/BEBC/BEBC_CC1ppim_XSec_1DQ2_antinu.h
similarity index 100%
rename from src/BEBC/BEBC_CC1ppim_XSec_1DQ2_antinu.h
rename to old_src/BEBC/BEBC_CC1ppim_XSec_1DQ2_antinu.h
diff --git a/src/BEBC/BEBC_CC1ppip_XSec_1DEnu_nu.cxx b/old_src/BEBC/BEBC_CC1ppip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CC1ppip_XSec_1DEnu_nu.cxx
rename to old_src/BEBC/BEBC_CC1ppip_XSec_1DEnu_nu.cxx
diff --git a/src/BEBC/BEBC_CC1ppip_XSec_1DEnu_nu.h b/old_src/BEBC/BEBC_CC1ppip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/BEBC/BEBC_CC1ppip_XSec_1DEnu_nu.h
rename to old_src/BEBC/BEBC_CC1ppip_XSec_1DEnu_nu.h
diff --git a/src/BEBC/BEBC_CC1ppip_XSec_1DQ2_nu.cxx b/old_src/BEBC/BEBC_CC1ppip_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CC1ppip_XSec_1DQ2_nu.cxx
rename to old_src/BEBC/BEBC_CC1ppip_XSec_1DQ2_nu.cxx
diff --git a/src/BEBC/BEBC_CC1ppip_XSec_1DQ2_nu.h b/old_src/BEBC/BEBC_CC1ppip_XSec_1DQ2_nu.h
similarity index 100%
rename from src/BEBC/BEBC_CC1ppip_XSec_1DQ2_nu.h
rename to old_src/BEBC/BEBC_CC1ppip_XSec_1DQ2_nu.h
diff --git a/src/BEBC/BEBC_CCQE_XSec_1DQ2_nu.cxx b/old_src/BEBC/BEBC_CCQE_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/BEBC/BEBC_CCQE_XSec_1DQ2_nu.cxx
rename to old_src/BEBC/BEBC_CCQE_XSec_1DQ2_nu.cxx
diff --git a/src/BEBC/BEBC_CCQE_XSec_1DQ2_nu.h b/old_src/BEBC/BEBC_CCQE_XSec_1DQ2_nu.h
similarity index 100%
rename from src/BEBC/BEBC_CCQE_XSec_1DQ2_nu.h
rename to old_src/BEBC/BEBC_CCQE_XSec_1DQ2_nu.h
diff --git a/src/BEBC/CMakeLists.txt b/old_src/BEBC/CMakeLists.txt
similarity index 100%
rename from src/BEBC/CMakeLists.txt
rename to old_src/BEBC/CMakeLists.txt
diff --git a/src/BNL/BNL_CC1npip_Evt_1DQ2_nu.cxx b/old_src/BNL/BNL_CC1npip_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/BNL/BNL_CC1npip_Evt_1DQ2_nu.cxx
rename to old_src/BNL/BNL_CC1npip_Evt_1DQ2_nu.cxx
diff --git a/src/BNL/BNL_CC1npip_Evt_1DQ2_nu.h b/old_src/BNL/BNL_CC1npip_Evt_1DQ2_nu.h
similarity index 100%
rename from src/BNL/BNL_CC1npip_Evt_1DQ2_nu.h
rename to old_src/BNL/BNL_CC1npip_Evt_1DQ2_nu.h
diff --git a/src/BNL/BNL_CC1npip_XSec_1DEnu_nu.cxx b/old_src/BNL/BNL_CC1npip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/BNL/BNL_CC1npip_XSec_1DEnu_nu.cxx
rename to old_src/BNL/BNL_CC1npip_XSec_1DEnu_nu.cxx
diff --git a/src/BNL/BNL_CC1npip_XSec_1DEnu_nu.h b/old_src/BNL/BNL_CC1npip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/BNL/BNL_CC1npip_XSec_1DEnu_nu.h
rename to old_src/BNL/BNL_CC1npip_XSec_1DEnu_nu.h
diff --git a/src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.cxx b/old_src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.cxx
rename to old_src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.cxx
diff --git a/src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.h b/old_src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.h
similarity index 100%
rename from src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.h
rename to old_src/BNL/BNL_CC1pi0_Evt_1DQ2_nu.h
diff --git a/src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.cxx b/old_src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.cxx
rename to old_src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.cxx
diff --git a/src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.h b/old_src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.h
similarity index 100%
rename from src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.h
rename to old_src/BNL/BNL_CC1pi0_XSec_1DEnu_nu.h
diff --git a/src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.cxx b/old_src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.cxx
rename to old_src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.cxx
diff --git a/src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.h b/old_src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.h
similarity index 100%
rename from src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.h
rename to old_src/BNL/BNL_CC1ppip_Evt_1DQ2_nu.h
diff --git a/src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.cxx b/old_src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.cxx
similarity index 100%
rename from src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.cxx
rename to old_src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.cxx
diff --git a/src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.h b/old_src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.h
similarity index 100%
rename from src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.h
rename to old_src/BNL/BNL_CC1ppip_Evt_1DcosthAdler_nu.h
diff --git a/src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.cxx b/old_src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.cxx
similarity index 100%
rename from src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.cxx
rename to old_src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.cxx
diff --git a/src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.h b/old_src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.h
similarity index 100%
rename from src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.h
rename to old_src/BNL/BNL_CC1ppip_Evt_1Dphi_nu.h
diff --git a/src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.cxx b/old_src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.cxx
rename to old_src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.cxx
diff --git a/src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.h b/old_src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.h
rename to old_src/BNL/BNL_CC1ppip_XSec_1DEnu_nu.h
diff --git a/src/BNL/BNL_CCQE_Evt_1DQ2_nu.cxx b/old_src/BNL/BNL_CCQE_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/BNL/BNL_CCQE_Evt_1DQ2_nu.cxx
rename to old_src/BNL/BNL_CCQE_Evt_1DQ2_nu.cxx
diff --git a/src/BNL/BNL_CCQE_Evt_1DQ2_nu.h b/old_src/BNL/BNL_CCQE_Evt_1DQ2_nu.h
similarity index 100%
rename from src/BNL/BNL_CCQE_Evt_1DQ2_nu.h
rename to old_src/BNL/BNL_CCQE_Evt_1DQ2_nu.h
diff --git a/src/BNL/BNL_CCQE_XSec_1DEnu_nu.cxx b/old_src/BNL/BNL_CCQE_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/BNL/BNL_CCQE_XSec_1DEnu_nu.cxx
rename to old_src/BNL/BNL_CCQE_XSec_1DEnu_nu.cxx
diff --git a/src/BNL/BNL_CCQE_XSec_1DEnu_nu.h b/old_src/BNL/BNL_CCQE_XSec_1DEnu_nu.h
similarity index 100%
rename from src/BNL/BNL_CCQE_XSec_1DEnu_nu.h
rename to old_src/BNL/BNL_CCQE_XSec_1DEnu_nu.h
diff --git a/src/BNL/CMakeLists.txt b/old_src/BNL/CMakeLists.txt
similarity index 100%
rename from src/BNL/CMakeLists.txt
rename to old_src/BNL/CMakeLists.txt
diff --git a/src/BNL/SAMPLEREADME b/old_src/BNL/SAMPLEREADME
similarity index 100%
rename from src/BNL/SAMPLEREADME
rename to old_src/BNL/SAMPLEREADME
diff --git a/src/Config/CMakeLists.txt b/old_src/Config/CMakeLists.txt
similarity index 100%
rename from src/Config/CMakeLists.txt
rename to old_src/Config/CMakeLists.txt
diff --git a/src/Config/NuisConfig.cxx b/old_src/Config/NuisConfig.cxx
similarity index 100%
rename from src/Config/NuisConfig.cxx
rename to old_src/Config/NuisConfig.cxx
diff --git a/src/Config/NuisConfig.h b/old_src/Config/NuisConfig.h
similarity index 100%
rename from src/Config/NuisConfig.h
rename to old_src/Config/NuisConfig.h
diff --git a/src/Config/NuisKey.cxx b/old_src/Config/NuisKey.cxx
similarity index 100%
rename from src/Config/NuisKey.cxx
rename to old_src/Config/NuisKey.cxx
diff --git a/src/Config/NuisKey.h b/old_src/Config/NuisKey.h
similarity index 100%
rename from src/Config/NuisKey.h
rename to old_src/Config/NuisKey.h
diff --git a/src/Devel/CMakeLists.txt b/old_src/Devel/CMakeLists.txt
similarity index 100%
rename from src/Devel/CMakeLists.txt
rename to old_src/Devel/CMakeLists.txt
diff --git a/src/Devel/README b/old_src/Devel/README
similarity index 100%
rename from src/Devel/README
rename to old_src/Devel/README
diff --git a/src/Devel/SAMPLEREADME b/old_src/Devel/SAMPLEREADME
similarity index 100%
rename from src/Devel/SAMPLEREADME
rename to old_src/Devel/SAMPLEREADME
diff --git a/src/Electron/CLAS6-EG2_Accepter.cxx b/old_src/Electron/CLAS6-EG2_Accepter.cxx
similarity index 100%
rename from src/Electron/CLAS6-EG2_Accepter.cxx
rename to old_src/Electron/CLAS6-EG2_Accepter.cxx
diff --git a/src/Electron/CMakeLists.txt b/old_src/Electron/CMakeLists.txt
similarity index 100%
rename from src/Electron/CMakeLists.txt
rename to old_src/Electron/CMakeLists.txt
diff --git a/src/Electron/ElectronScattering_DurhamData.cxx b/old_src/Electron/ElectronScattering_DurhamData.cxx
similarity index 100%
rename from src/Electron/ElectronScattering_DurhamData.cxx
rename to old_src/Electron/ElectronScattering_DurhamData.cxx
diff --git a/src/Electron/ElectronScattering_DurhamData.h b/old_src/Electron/ElectronScattering_DurhamData.h
similarity index 100%
rename from src/Electron/ElectronScattering_DurhamData.h
rename to old_src/Electron/ElectronScattering_DurhamData.h
diff --git a/src/FCN/#JointFCN.cxx# b/old_src/FCN/#JointFCN.cxx#
similarity index 100%
rename from src/FCN/#JointFCN.cxx#
rename to old_src/FCN/#JointFCN.cxx#
diff --git a/src/FCN/CMakeLists.txt b/old_src/FCN/CMakeLists.txt
similarity index 100%
rename from src/FCN/CMakeLists.txt
rename to old_src/FCN/CMakeLists.txt
diff --git a/src/FCN/JointFCN.cxx b/old_src/FCN/JointFCN.cxx
similarity index 100%
rename from src/FCN/JointFCN.cxx
rename to old_src/FCN/JointFCN.cxx
diff --git a/src/FCN/JointFCN.h b/old_src/FCN/JointFCN.h
similarity index 100%
rename from src/FCN/JointFCN.h
rename to old_src/FCN/JointFCN.h
diff --git a/src/FCN/MinimizerFCN.h b/old_src/FCN/MinimizerFCN.h
similarity index 100%
rename from src/FCN/MinimizerFCN.h
rename to old_src/FCN/MinimizerFCN.h
diff --git a/src/FCN/SAMPLEREADME b/old_src/FCN/SAMPLEREADME
similarity index 100%
rename from src/FCN/SAMPLEREADME
rename to old_src/FCN/SAMPLEREADME
diff --git a/src/FCN/SampleList.cxx b/old_src/FCN/SampleList.cxx
similarity index 100%
rename from src/FCN/SampleList.cxx
rename to old_src/FCN/SampleList.cxx
diff --git a/src/FCN/SampleList.h b/old_src/FCN/SampleList.h
similarity index 100%
rename from src/FCN/SampleList.h
rename to old_src/FCN/SampleList.h
diff --git a/src/FCN/SubMakefile.backup b/old_src/FCN/SubMakefile.backup
similarity index 100%
rename from src/FCN/SubMakefile.backup
rename to old_src/FCN/SubMakefile.backup
diff --git a/src/FCN/fullsamplelist.card b/old_src/FCN/fullsamplelist.card
similarity index 100%
rename from src/FCN/fullsamplelist.card
rename to old_src/FCN/fullsamplelist.card
diff --git a/src/FCN/nuiscardcreator.py b/old_src/FCN/nuiscardcreator.py
similarity index 100%
rename from src/FCN/nuiscardcreator.py
rename to old_src/FCN/nuiscardcreator.py
diff --git a/src/FCN/sample_list.xml b/old_src/FCN/sample_list.xml
similarity index 100%
rename from src/FCN/sample_list.xml
rename to old_src/FCN/sample_list.xml
diff --git a/src/FNAL/CMakeLists.txt b/old_src/FNAL/CMakeLists.txt
similarity index 100%
rename from src/FNAL/CMakeLists.txt
rename to old_src/FNAL/CMakeLists.txt
diff --git a/src/FNAL/FNAL_CC1ppim_XSec_1DEnu_antinu.cxx b/old_src/FNAL/FNAL_CC1ppim_XSec_1DEnu_antinu.cxx
similarity index 100%
rename from src/FNAL/FNAL_CC1ppim_XSec_1DEnu_antinu.cxx
rename to old_src/FNAL/FNAL_CC1ppim_XSec_1DEnu_antinu.cxx
diff --git a/src/FNAL/FNAL_CC1ppim_XSec_1DEnu_antinu.h b/old_src/FNAL/FNAL_CC1ppim_XSec_1DEnu_antinu.h
similarity index 100%
rename from src/FNAL/FNAL_CC1ppim_XSec_1DEnu_antinu.h
rename to old_src/FNAL/FNAL_CC1ppim_XSec_1DEnu_antinu.h
diff --git a/src/FNAL/FNAL_CC1ppip_Evt_1DQ2_nu.cxx b/old_src/FNAL/FNAL_CC1ppip_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/FNAL/FNAL_CC1ppip_Evt_1DQ2_nu.cxx
rename to old_src/FNAL/FNAL_CC1ppip_Evt_1DQ2_nu.cxx
diff --git a/src/FNAL/FNAL_CC1ppip_Evt_1DQ2_nu.h b/old_src/FNAL/FNAL_CC1ppip_Evt_1DQ2_nu.h
similarity index 100%
rename from src/FNAL/FNAL_CC1ppip_Evt_1DQ2_nu.h
rename to old_src/FNAL/FNAL_CC1ppip_Evt_1DQ2_nu.h
diff --git a/src/FNAL/FNAL_CC1ppip_XSec_1DEnu_nu.cxx b/old_src/FNAL/FNAL_CC1ppip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/FNAL/FNAL_CC1ppip_XSec_1DEnu_nu.cxx
rename to old_src/FNAL/FNAL_CC1ppip_XSec_1DEnu_nu.cxx
diff --git a/src/FNAL/FNAL_CC1ppip_XSec_1DEnu_nu.h b/old_src/FNAL/FNAL_CC1ppip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/FNAL/FNAL_CC1ppip_XSec_1DEnu_nu.h
rename to old_src/FNAL/FNAL_CC1ppip_XSec_1DEnu_nu.h
diff --git a/src/FNAL/FNAL_CC1ppip_XSec_1DQ2_nu.cxx b/old_src/FNAL/FNAL_CC1ppip_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/FNAL/FNAL_CC1ppip_XSec_1DQ2_nu.cxx
rename to old_src/FNAL/FNAL_CC1ppip_XSec_1DQ2_nu.cxx
diff --git a/src/FNAL/FNAL_CC1ppip_XSec_1DQ2_nu.h b/old_src/FNAL/FNAL_CC1ppip_XSec_1DQ2_nu.h
similarity index 100%
rename from src/FNAL/FNAL_CC1ppip_XSec_1DQ2_nu.h
rename to old_src/FNAL/FNAL_CC1ppip_XSec_1DQ2_nu.h
diff --git a/src/FNAL/FNAL_CCQE_Evt_1DQ2_nu.cxx b/old_src/FNAL/FNAL_CCQE_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/FNAL/FNAL_CCQE_Evt_1DQ2_nu.cxx
rename to old_src/FNAL/FNAL_CCQE_Evt_1DQ2_nu.cxx
diff --git a/src/FNAL/FNAL_CCQE_Evt_1DQ2_nu.h b/old_src/FNAL/FNAL_CCQE_Evt_1DQ2_nu.h
similarity index 100%
rename from src/FNAL/FNAL_CCQE_Evt_1DQ2_nu.h
rename to old_src/FNAL/FNAL_CCQE_Evt_1DQ2_nu.h
diff --git a/src/FitBase/CMakeLists.txt b/old_src/FitBase/CMakeLists.txt
similarity index 100%
rename from src/FitBase/CMakeLists.txt
rename to old_src/FitBase/CMakeLists.txt
diff --git a/src/FitBase/CustomVariableBoxes.h b/old_src/FitBase/CustomVariableBoxes.h
similarity index 100%
rename from src/FitBase/CustomVariableBoxes.h
rename to old_src/FitBase/CustomVariableBoxes.h
diff --git a/src/FitBase/EventManager.cxx b/old_src/FitBase/EventManager.cxx
similarity index 100%
rename from src/FitBase/EventManager.cxx
rename to old_src/FitBase/EventManager.cxx
diff --git a/src/FitBase/EventManager.h b/old_src/FitBase/EventManager.h
similarity index 100%
rename from src/FitBase/EventManager.h
rename to old_src/FitBase/EventManager.h
diff --git a/src/FitBase/JointMeas1D.cxx b/old_src/FitBase/JointMeas1D.cxx
similarity index 100%
rename from src/FitBase/JointMeas1D.cxx
rename to old_src/FitBase/JointMeas1D.cxx
diff --git a/src/FitBase/JointMeas1D.h b/old_src/FitBase/JointMeas1D.h
similarity index 100%
rename from src/FitBase/JointMeas1D.h
rename to old_src/FitBase/JointMeas1D.h
diff --git a/src/FitBase/Measurement1D.cxx b/old_src/FitBase/Measurement1D.cxx
similarity index 100%
rename from src/FitBase/Measurement1D.cxx
rename to old_src/FitBase/Measurement1D.cxx
diff --git a/src/FitBase/Measurement1D.h b/old_src/FitBase/Measurement1D.h
similarity index 100%
rename from src/FitBase/Measurement1D.h
rename to old_src/FitBase/Measurement1D.h
diff --git a/src/FitBase/Measurement2D.cxx b/old_src/FitBase/Measurement2D.cxx
similarity index 100%
rename from src/FitBase/Measurement2D.cxx
rename to old_src/FitBase/Measurement2D.cxx
diff --git a/src/FitBase/Measurement2D.h b/old_src/FitBase/Measurement2D.h
similarity index 100%
rename from src/FitBase/Measurement2D.h
rename to old_src/FitBase/Measurement2D.h
diff --git a/src/FitBase/MeasurementBase.cxx b/old_src/FitBase/MeasurementBase.cxx
similarity index 100%
rename from src/FitBase/MeasurementBase.cxx
rename to old_src/FitBase/MeasurementBase.cxx
diff --git a/src/FitBase/MeasurementBase.h b/old_src/FitBase/MeasurementBase.h
similarity index 100%
rename from src/FitBase/MeasurementBase.h
rename to old_src/FitBase/MeasurementBase.h
diff --git a/src/FitBase/MeasurementVariableBox.cxx b/old_src/FitBase/MeasurementVariableBox.cxx
similarity index 100%
rename from src/FitBase/MeasurementVariableBox.cxx
rename to old_src/FitBase/MeasurementVariableBox.cxx
diff --git a/src/FitBase/MeasurementVariableBox.h b/old_src/FitBase/MeasurementVariableBox.h
similarity index 100%
rename from src/FitBase/MeasurementVariableBox.h
rename to old_src/FitBase/MeasurementVariableBox.h
diff --git a/src/FitBase/MeasurementVariableBox1D.cxx b/old_src/FitBase/MeasurementVariableBox1D.cxx
similarity index 100%
rename from src/FitBase/MeasurementVariableBox1D.cxx
rename to old_src/FitBase/MeasurementVariableBox1D.cxx
diff --git a/src/FitBase/MeasurementVariableBox1D.h b/old_src/FitBase/MeasurementVariableBox1D.h
similarity index 100%
rename from src/FitBase/MeasurementVariableBox1D.h
rename to old_src/FitBase/MeasurementVariableBox1D.h
diff --git a/src/FitBase/MeasurementVariableBox2D.cxx b/old_src/FitBase/MeasurementVariableBox2D.cxx
similarity index 100%
rename from src/FitBase/MeasurementVariableBox2D.cxx
rename to old_src/FitBase/MeasurementVariableBox2D.cxx
diff --git a/src/FitBase/MeasurementVariableBox2D.h b/old_src/FitBase/MeasurementVariableBox2D.h
similarity index 100%
rename from src/FitBase/MeasurementVariableBox2D.h
rename to old_src/FitBase/MeasurementVariableBox2D.h
diff --git a/src/FitBase/ParamPull.cxx b/old_src/FitBase/ParamPull.cxx
similarity index 100%
rename from src/FitBase/ParamPull.cxx
rename to old_src/FitBase/ParamPull.cxx
diff --git a/src/FitBase/ParamPull.h b/old_src/FitBase/ParamPull.h
similarity index 100%
rename from src/FitBase/ParamPull.h
rename to old_src/FitBase/ParamPull.h
diff --git a/src/FitBase/SAMPLEREADME b/old_src/FitBase/SAMPLEREADME
similarity index 100%
rename from src/FitBase/SAMPLEREADME
rename to old_src/FitBase/SAMPLEREADME
diff --git a/src/FitBase/SampleSettings.cxx b/old_src/FitBase/SampleSettings.cxx
similarity index 100%
rename from src/FitBase/SampleSettings.cxx
rename to old_src/FitBase/SampleSettings.cxx
diff --git a/src/FitBase/SampleSettings.h b/old_src/FitBase/SampleSettings.h
similarity index 100%
rename from src/FitBase/SampleSettings.h
rename to old_src/FitBase/SampleSettings.h
diff --git a/src/FitBase/StackBase.cxx b/old_src/FitBase/StackBase.cxx
similarity index 100%
rename from src/FitBase/StackBase.cxx
rename to old_src/FitBase/StackBase.cxx
diff --git a/src/FitBase/StackBase.h b/old_src/FitBase/StackBase.h
similarity index 100%
rename from src/FitBase/StackBase.h
rename to old_src/FitBase/StackBase.h
diff --git a/src/FitBase/StandardStacks.cxx b/old_src/FitBase/StandardStacks.cxx
similarity index 100%
rename from src/FitBase/StandardStacks.cxx
rename to old_src/FitBase/StandardStacks.cxx
diff --git a/src/FitBase/StandardStacks.h b/old_src/FitBase/StandardStacks.h
similarity index 100%
rename from src/FitBase/StandardStacks.h
rename to old_src/FitBase/StandardStacks.h
diff --git a/src/FitBase/TemplateMeas1D.cxx b/old_src/FitBase/TemplateMeas1D.cxx
similarity index 100%
rename from src/FitBase/TemplateMeas1D.cxx
rename to old_src/FitBase/TemplateMeas1D.cxx
diff --git a/src/FitBase/TemplateMeas1D.h b/old_src/FitBase/TemplateMeas1D.h
similarity index 100%
rename from src/FitBase/TemplateMeas1D.h
rename to old_src/FitBase/TemplateMeas1D.h
diff --git a/src/FitBase/dial_conversion.card b/old_src/FitBase/dial_conversion.card
similarity index 100%
rename from src/FitBase/dial_conversion.card
rename to old_src/FitBase/dial_conversion.card
diff --git a/src/GGM/CMakeLists.txt b/old_src/GGM/CMakeLists.txt
similarity index 100%
rename from src/GGM/CMakeLists.txt
rename to old_src/GGM/CMakeLists.txt
diff --git a/src/GGM/GGM_CC1ppip_Evt_1DQ2_nu.cxx b/old_src/GGM/GGM_CC1ppip_Evt_1DQ2_nu.cxx
similarity index 100%
rename from src/GGM/GGM_CC1ppip_Evt_1DQ2_nu.cxx
rename to old_src/GGM/GGM_CC1ppip_Evt_1DQ2_nu.cxx
diff --git a/src/GGM/GGM_CC1ppip_Evt_1DQ2_nu.h b/old_src/GGM/GGM_CC1ppip_Evt_1DQ2_nu.h
similarity index 100%
rename from src/GGM/GGM_CC1ppip_Evt_1DQ2_nu.h
rename to old_src/GGM/GGM_CC1ppip_Evt_1DQ2_nu.h
diff --git a/src/GGM/GGM_CC1ppip_XSec_1DEnu_nu.cxx b/old_src/GGM/GGM_CC1ppip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/GGM/GGM_CC1ppip_XSec_1DEnu_nu.cxx
rename to old_src/GGM/GGM_CC1ppip_XSec_1DEnu_nu.cxx
diff --git a/src/GGM/GGM_CC1ppip_XSec_1DEnu_nu.h b/old_src/GGM/GGM_CC1ppip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/GGM/GGM_CC1ppip_XSec_1DEnu_nu.h
rename to old_src/GGM/GGM_CC1ppip_XSec_1DEnu_nu.h
diff --git a/src/Genie/CMakeLists.txt b/old_src/Genie/CMakeLists.txt
similarity index 100%
rename from src/Genie/CMakeLists.txt
rename to old_src/Genie/CMakeLists.txt
diff --git a/src/Genie/GNUISANCEFlux.cxx b/old_src/Genie/GNUISANCEFlux.cxx
similarity index 100%
rename from src/Genie/GNUISANCEFlux.cxx
rename to old_src/Genie/GNUISANCEFlux.cxx
diff --git a/src/Genie/GNUISANCEFlux.h b/old_src/Genie/GNUISANCEFlux.h
similarity index 100%
rename from src/Genie/GNUISANCEFlux.h
rename to old_src/Genie/GNUISANCEFlux.h
diff --git a/src/Genie/GNUISANCEMCJDriver.cxx b/old_src/Genie/GNUISANCEMCJDriver.cxx
similarity index 100%
rename from src/Genie/GNUISANCEMCJDriver.cxx
rename to old_src/Genie/GNUISANCEMCJDriver.cxx
diff --git a/src/Genie/GNUISANCEMCJDriver.h b/old_src/Genie/GNUISANCEMCJDriver.h
similarity index 100%
rename from src/Genie/GNUISANCEMCJDriver.h
rename to old_src/Genie/GNUISANCEMCJDriver.h
diff --git a/src/InputHandler/BaseFitEvt.cxx b/old_src/InputHandler/BaseFitEvt.cxx
similarity index 100%
rename from src/InputHandler/BaseFitEvt.cxx
rename to old_src/InputHandler/BaseFitEvt.cxx
diff --git a/src/InputHandler/BaseFitEvt.h b/old_src/InputHandler/BaseFitEvt.h
similarity index 100%
rename from src/InputHandler/BaseFitEvt.h
rename to old_src/InputHandler/BaseFitEvt.h
diff --git a/src/InputHandler/CMakeLists.txt b/old_src/InputHandler/CMakeLists.txt
similarity index 100%
rename from src/InputHandler/CMakeLists.txt
rename to old_src/InputHandler/CMakeLists.txt
diff --git a/src/InputHandler/FitEvent.cxx b/old_src/InputHandler/FitEvent.cxx
similarity index 100%
rename from src/InputHandler/FitEvent.cxx
rename to old_src/InputHandler/FitEvent.cxx
diff --git a/src/InputHandler/FitEvent.h b/old_src/InputHandler/FitEvent.h
similarity index 100%
rename from src/InputHandler/FitEvent.h
rename to old_src/InputHandler/FitEvent.h
diff --git a/src/InputHandler/FitEventInputHandler.cxx b/old_src/InputHandler/FitEventInputHandler.cxx
similarity index 100%
rename from src/InputHandler/FitEventInputHandler.cxx
rename to old_src/InputHandler/FitEventInputHandler.cxx
diff --git a/src/InputHandler/FitEventInputHandler.h b/old_src/InputHandler/FitEventInputHandler.h
similarity index 100%
rename from src/InputHandler/FitEventInputHandler.h
rename to old_src/InputHandler/FitEventInputHandler.h
diff --git a/src/InputHandler/FitParticle.cxx b/old_src/InputHandler/FitParticle.cxx
similarity index 100%
rename from src/InputHandler/FitParticle.cxx
rename to old_src/InputHandler/FitParticle.cxx
diff --git a/src/InputHandler/FitParticle.h b/old_src/InputHandler/FitParticle.h
similarity index 100%
rename from src/InputHandler/FitParticle.h
rename to old_src/InputHandler/FitParticle.h
diff --git a/src/InputHandler/GENIEInputHandler.cxx b/old_src/InputHandler/GENIEInputHandler.cxx
similarity index 100%
rename from src/InputHandler/GENIEInputHandler.cxx
rename to old_src/InputHandler/GENIEInputHandler.cxx
diff --git a/src/InputHandler/GENIEInputHandler.h b/old_src/InputHandler/GENIEInputHandler.h
similarity index 100%
rename from src/InputHandler/GENIEInputHandler.h
rename to old_src/InputHandler/GENIEInputHandler.h
diff --git a/src/InputHandler/GIBUUInputHandler.cxx b/old_src/InputHandler/GIBUUInputHandler.cxx
similarity index 100%
rename from src/InputHandler/GIBUUInputHandler.cxx
rename to old_src/InputHandler/GIBUUInputHandler.cxx
diff --git a/src/InputHandler/GIBUUInputHandler.h b/old_src/InputHandler/GIBUUInputHandler.h
similarity index 100%
rename from src/InputHandler/GIBUUInputHandler.h
rename to old_src/InputHandler/GIBUUInputHandler.h
diff --git a/src/InputHandler/GeneratorInfoBase.h b/old_src/InputHandler/GeneratorInfoBase.h
similarity index 100%
rename from src/InputHandler/GeneratorInfoBase.h
rename to old_src/InputHandler/GeneratorInfoBase.h
diff --git a/src/InputHandler/GeneratorUtils.cxx b/old_src/InputHandler/GeneratorUtils.cxx
similarity index 100%
rename from src/InputHandler/GeneratorUtils.cxx
rename to old_src/InputHandler/GeneratorUtils.cxx
diff --git a/src/InputHandler/GeneratorUtils.h b/old_src/InputHandler/GeneratorUtils.h
similarity index 100%
rename from src/InputHandler/GeneratorUtils.h
rename to old_src/InputHandler/GeneratorUtils.h
diff --git a/src/InputHandler/HepMCTextInputHandler.cxx b/old_src/InputHandler/HepMCTextInputHandler.cxx
similarity index 100%
rename from src/InputHandler/HepMCTextInputHandler.cxx
rename to old_src/InputHandler/HepMCTextInputHandler.cxx
diff --git a/src/InputHandler/HepMCTextInputHandler.h b/old_src/InputHandler/HepMCTextInputHandler.h
similarity index 100%
rename from src/InputHandler/HepMCTextInputHandler.h
rename to old_src/InputHandler/HepMCTextInputHandler.h
diff --git a/src/InputHandler/HistogramInputHandler.cxx b/old_src/InputHandler/HistogramInputHandler.cxx
similarity index 100%
rename from src/InputHandler/HistogramInputHandler.cxx
rename to old_src/InputHandler/HistogramInputHandler.cxx
diff --git a/src/InputHandler/HistogramInputHandler.h b/old_src/InputHandler/HistogramInputHandler.h
similarity index 100%
rename from src/InputHandler/HistogramInputHandler.h
rename to old_src/InputHandler/HistogramInputHandler.h
diff --git a/src/InputHandler/InputFactory.cxx b/old_src/InputHandler/InputFactory.cxx
similarity index 100%
rename from src/InputHandler/InputFactory.cxx
rename to old_src/InputHandler/InputFactory.cxx
diff --git a/src/InputHandler/InputFactory.h b/old_src/InputHandler/InputFactory.h
similarity index 100%
rename from src/InputHandler/InputFactory.h
rename to old_src/InputHandler/InputFactory.h
diff --git a/src/InputHandler/InputHandler.cxx b/old_src/InputHandler/InputHandler.cxx
similarity index 100%
rename from src/InputHandler/InputHandler.cxx
rename to old_src/InputHandler/InputHandler.cxx
diff --git a/src/InputHandler/InputHandler.h b/old_src/InputHandler/InputHandler.h
similarity index 100%
rename from src/InputHandler/InputHandler.h
rename to old_src/InputHandler/InputHandler.h
diff --git a/src/InputHandler/InputTypes.h b/old_src/InputHandler/InputTypes.h
similarity index 100%
rename from src/InputHandler/InputTypes.h
rename to old_src/InputHandler/InputTypes.h
diff --git a/src/InputHandler/InputUtils.cxx b/old_src/InputHandler/InputUtils.cxx
similarity index 100%
rename from src/InputHandler/InputUtils.cxx
rename to old_src/InputHandler/InputUtils.cxx
diff --git a/src/InputHandler/InputUtils.h b/old_src/InputHandler/InputUtils.h
similarity index 100%
rename from src/InputHandler/InputUtils.h
rename to old_src/InputHandler/InputUtils.h
diff --git a/src/InputHandler/InteractionModes.h b/old_src/InputHandler/InteractionModes.h
similarity index 100%
rename from src/InputHandler/InteractionModes.h
rename to old_src/InputHandler/InteractionModes.h
diff --git a/src/InputHandler/NEUTInputHandler.cxx b/old_src/InputHandler/NEUTInputHandler.cxx
similarity index 100%
rename from src/InputHandler/NEUTInputHandler.cxx
rename to old_src/InputHandler/NEUTInputHandler.cxx
diff --git a/src/InputHandler/NEUTInputHandler.h b/old_src/InputHandler/NEUTInputHandler.h
similarity index 100%
rename from src/InputHandler/NEUTInputHandler.h
rename to old_src/InputHandler/NEUTInputHandler.h
diff --git a/src/InputHandler/NUANCEInputHandler.cxx b/old_src/InputHandler/NUANCEInputHandler.cxx
similarity index 100%
rename from src/InputHandler/NUANCEInputHandler.cxx
rename to old_src/InputHandler/NUANCEInputHandler.cxx
diff --git a/src/InputHandler/NUANCEInputHandler.h b/old_src/InputHandler/NUANCEInputHandler.h
similarity index 100%
rename from src/InputHandler/NUANCEInputHandler.h
rename to old_src/InputHandler/NUANCEInputHandler.h
diff --git a/src/InputHandler/NuWroInputHandler.cxx b/old_src/InputHandler/NuWroInputHandler.cxx
similarity index 100%
rename from src/InputHandler/NuWroInputHandler.cxx
rename to old_src/InputHandler/NuWroInputHandler.cxx
diff --git a/src/InputHandler/NuWroInputHandler.h b/old_src/InputHandler/NuWroInputHandler.h
similarity index 100%
rename from src/InputHandler/NuWroInputHandler.h
rename to old_src/InputHandler/NuWroInputHandler.h
diff --git a/src/InputHandler/NuanceEvent.cxx b/old_src/InputHandler/NuanceEvent.cxx
similarity index 100%
rename from src/InputHandler/NuanceEvent.cxx
rename to old_src/InputHandler/NuanceEvent.cxx
diff --git a/src/InputHandler/NuanceEvent.h b/old_src/InputHandler/NuanceEvent.h
similarity index 100%
rename from src/InputHandler/NuanceEvent.h
rename to old_src/InputHandler/NuanceEvent.h
diff --git a/src/InputHandler/SigmaQ0HistogramInputHandler.cxx b/old_src/InputHandler/SigmaQ0HistogramInputHandler.cxx
similarity index 100%
rename from src/InputHandler/SigmaQ0HistogramInputHandler.cxx
rename to old_src/InputHandler/SigmaQ0HistogramInputHandler.cxx
diff --git a/src/InputHandler/SigmaQ0HistogramInputHandler.h b/old_src/InputHandler/SigmaQ0HistogramInputHandler.h
similarity index 100%
rename from src/InputHandler/SigmaQ0HistogramInputHandler.h
rename to old_src/InputHandler/SigmaQ0HistogramInputHandler.h
diff --git a/src/InputHandler/SplineInputHandler.cxx b/old_src/InputHandler/SplineInputHandler.cxx
similarity index 100%
rename from src/InputHandler/SplineInputHandler.cxx
rename to old_src/InputHandler/SplineInputHandler.cxx
diff --git a/src/InputHandler/SplineInputHandler.h b/old_src/InputHandler/SplineInputHandler.h
similarity index 100%
rename from src/InputHandler/SplineInputHandler.h
rename to old_src/InputHandler/SplineInputHandler.h
diff --git a/src/InputHandler/StdHepEvt.cxx b/old_src/InputHandler/StdHepEvt.cxx
similarity index 100%
rename from src/InputHandler/StdHepEvt.cxx
rename to old_src/InputHandler/StdHepEvt.cxx
diff --git a/src/InputHandler/StdHepEvt.h b/old_src/InputHandler/StdHepEvt.h
similarity index 100%
rename from src/InputHandler/StdHepEvt.h
rename to old_src/InputHandler/StdHepEvt.h
diff --git a/src/K2K/CMakeLists.txt b/old_src/K2K/CMakeLists.txt
similarity index 100%
rename from src/K2K/CMakeLists.txt
rename to old_src/K2K/CMakeLists.txt
diff --git a/src/K2K/K2K_NC1pi0_Evt_1Dppi0_nu.cxx b/old_src/K2K/K2K_NC1pi0_Evt_1Dppi0_nu.cxx
similarity index 100%
rename from src/K2K/K2K_NC1pi0_Evt_1Dppi0_nu.cxx
rename to old_src/K2K/K2K_NC1pi0_Evt_1Dppi0_nu.cxx
diff --git a/src/K2K/K2K_NC1pi0_Evt_1Dppi0_nu.h b/old_src/K2K/K2K_NC1pi0_Evt_1Dppi0_nu.h
similarity index 100%
rename from src/K2K/K2K_NC1pi0_Evt_1Dppi0_nu.h
rename to old_src/K2K/K2K_NC1pi0_Evt_1Dppi0_nu.h
diff --git a/src/K2K/SAMPLEREADME b/old_src/K2K/SAMPLEREADME
similarity index 100%
rename from src/K2K/SAMPLEREADME
rename to old_src/K2K/SAMPLEREADME
diff --git a/src/Logger/CMakeLists.txt b/old_src/Logger/CMakeLists.txt
similarity index 100%
rename from src/Logger/CMakeLists.txt
rename to old_src/Logger/CMakeLists.txt
diff --git a/src/Logger/FitLogger.cxx b/old_src/Logger/FitLogger.cxx
similarity index 100%
rename from src/Logger/FitLogger.cxx
rename to old_src/Logger/FitLogger.cxx
diff --git a/src/Logger/FitLogger.h b/old_src/Logger/FitLogger.h
similarity index 100%
rename from src/Logger/FitLogger.h
rename to old_src/Logger/FitLogger.h
diff --git a/src/Logger/Initialiser.cxx b/old_src/Logger/Initialiser.cxx
similarity index 100%
rename from src/Logger/Initialiser.cxx
rename to old_src/Logger/Initialiser.cxx
diff --git a/src/Logger/Initialiser.h b/old_src/Logger/Initialiser.h
similarity index 100%
rename from src/Logger/Initialiser.h
rename to old_src/Logger/Initialiser.h
diff --git a/src/Logger/PythiaQuiet.f b/old_src/Logger/PythiaQuiet.f
similarity index 100%
rename from src/Logger/PythiaQuiet.f
rename to old_src/Logger/PythiaQuiet.f
diff --git a/src/MCStudies/CMakeLists.txt b/old_src/MCStudies/CMakeLists.txt
similarity index 100%
rename from src/MCStudies/CMakeLists.txt
rename to old_src/MCStudies/CMakeLists.txt
diff --git a/src/MCStudies/ElectronFlux_FlatTree.cxx b/old_src/MCStudies/ElectronFlux_FlatTree.cxx
similarity index 100%
rename from src/MCStudies/ElectronFlux_FlatTree.cxx
rename to old_src/MCStudies/ElectronFlux_FlatTree.cxx
diff --git a/src/MCStudies/ElectronFlux_FlatTree.h b/old_src/MCStudies/ElectronFlux_FlatTree.h
similarity index 100%
rename from src/MCStudies/ElectronFlux_FlatTree.h
rename to old_src/MCStudies/ElectronFlux_FlatTree.h
diff --git a/src/MCStudies/ExpMultDist_CCQE_XSec_1DVar_FakeStudy.cxx b/old_src/MCStudies/ExpMultDist_CCQE_XSec_1DVar_FakeStudy.cxx
similarity index 100%
rename from src/MCStudies/ExpMultDist_CCQE_XSec_1DVar_FakeStudy.cxx
rename to old_src/MCStudies/ExpMultDist_CCQE_XSec_1DVar_FakeStudy.cxx
diff --git a/src/MCStudies/ExpMultDist_CCQE_XSec_1DVar_FakeStudy.h b/old_src/MCStudies/ExpMultDist_CCQE_XSec_1DVar_FakeStudy.h
similarity index 100%
rename from src/MCStudies/ExpMultDist_CCQE_XSec_1DVar_FakeStudy.h
rename to old_src/MCStudies/ExpMultDist_CCQE_XSec_1DVar_FakeStudy.h
diff --git a/src/MCStudies/ExpMultDist_CCQE_XSec_2DVar_FakeStudy.cxx b/old_src/MCStudies/ExpMultDist_CCQE_XSec_2DVar_FakeStudy.cxx
similarity index 100%
rename from src/MCStudies/ExpMultDist_CCQE_XSec_2DVar_FakeStudy.cxx
rename to old_src/MCStudies/ExpMultDist_CCQE_XSec_2DVar_FakeStudy.cxx
diff --git a/src/MCStudies/ExpMultDist_CCQE_XSec_2DVar_FakeStudy.h b/old_src/MCStudies/ExpMultDist_CCQE_XSec_2DVar_FakeStudy.h
similarity index 100%
rename from src/MCStudies/ExpMultDist_CCQE_XSec_2DVar_FakeStudy.h
rename to old_src/MCStudies/ExpMultDist_CCQE_XSec_2DVar_FakeStudy.h
diff --git a/src/MCStudies/GenericFlux_Tester.cxx b/old_src/MCStudies/GenericFlux_Tester.cxx
similarity index 100%
rename from src/MCStudies/GenericFlux_Tester.cxx
rename to old_src/MCStudies/GenericFlux_Tester.cxx
diff --git a/src/MCStudies/GenericFlux_Tester.h b/old_src/MCStudies/GenericFlux_Tester.h
similarity index 100%
rename from src/MCStudies/GenericFlux_Tester.h
rename to old_src/MCStudies/GenericFlux_Tester.h
diff --git a/src/MCStudies/GenericFlux_Vectors.cxx b/old_src/MCStudies/GenericFlux_Vectors.cxx
similarity index 100%
rename from src/MCStudies/GenericFlux_Vectors.cxx
rename to old_src/MCStudies/GenericFlux_Vectors.cxx
diff --git a/src/MCStudies/GenericFlux_Vectors.h b/old_src/MCStudies/GenericFlux_Vectors.h
similarity index 100%
rename from src/MCStudies/GenericFlux_Vectors.h
rename to old_src/MCStudies/GenericFlux_Vectors.h
diff --git a/src/MCStudies/MCStudy_CCQEHistograms.cxx b/old_src/MCStudies/MCStudy_CCQEHistograms.cxx
similarity index 100%
rename from src/MCStudies/MCStudy_CCQEHistograms.cxx
rename to old_src/MCStudies/MCStudy_CCQEHistograms.cxx
diff --git a/src/MCStudies/MCStudy_CCQEHistograms.h b/old_src/MCStudies/MCStudy_CCQEHistograms.h
similarity index 100%
rename from src/MCStudies/MCStudy_CCQEHistograms.h
rename to old_src/MCStudies/MCStudy_CCQEHistograms.h
diff --git a/src/MCStudies/MCStudy_KaonPreSelection.cxx b/old_src/MCStudies/MCStudy_KaonPreSelection.cxx
similarity index 100%
rename from src/MCStudies/MCStudy_KaonPreSelection.cxx
rename to old_src/MCStudies/MCStudy_KaonPreSelection.cxx
diff --git a/src/MCStudies/MCStudy_KaonPreSelection.h b/old_src/MCStudies/MCStudy_KaonPreSelection.h
similarity index 100%
rename from src/MCStudies/MCStudy_KaonPreSelection.h
rename to old_src/MCStudies/MCStudy_KaonPreSelection.h
diff --git a/src/MCStudies/MCStudy_MuonValidation.cxx b/old_src/MCStudies/MCStudy_MuonValidation.cxx
similarity index 100%
rename from src/MCStudies/MCStudy_MuonValidation.cxx
rename to old_src/MCStudies/MCStudy_MuonValidation.cxx
diff --git a/src/MCStudies/MCStudy_MuonValidation.h b/old_src/MCStudies/MCStudy_MuonValidation.h
similarity index 100%
rename from src/MCStudies/MCStudy_MuonValidation.h
rename to old_src/MCStudies/MCStudy_MuonValidation.h
diff --git a/src/MCStudies/MCStudy_NCpi0PreSelection.cxx b/old_src/MCStudies/MCStudy_NCpi0PreSelection.cxx
similarity index 100%
rename from src/MCStudies/MCStudy_NCpi0PreSelection.cxx
rename to old_src/MCStudies/MCStudy_NCpi0PreSelection.cxx
diff --git a/src/MCStudies/MCStudy_NCpi0PreSelection.h b/old_src/MCStudies/MCStudy_NCpi0PreSelection.h
similarity index 100%
rename from src/MCStudies/MCStudy_NCpi0PreSelection.h
rename to old_src/MCStudies/MCStudy_NCpi0PreSelection.h
diff --git a/src/MCStudies/OfficialNIWGPlots.cxx b/old_src/MCStudies/OfficialNIWGPlots.cxx
similarity index 100%
rename from src/MCStudies/OfficialNIWGPlots.cxx
rename to old_src/MCStudies/OfficialNIWGPlots.cxx
diff --git a/src/MCStudies/OfficialNIWGPlots.h b/old_src/MCStudies/OfficialNIWGPlots.h
similarity index 100%
rename from src/MCStudies/OfficialNIWGPlots.h
rename to old_src/MCStudies/OfficialNIWGPlots.h
diff --git a/src/MCStudies/OscStudies.md b/old_src/MCStudies/OscStudies.md
similarity index 100%
rename from src/MCStudies/OscStudies.md
rename to old_src/MCStudies/OscStudies.md
diff --git a/src/MCStudies/Simple_Osc.cxx b/old_src/MCStudies/Simple_Osc.cxx
similarity index 100%
rename from src/MCStudies/Simple_Osc.cxx
rename to old_src/MCStudies/Simple_Osc.cxx
diff --git a/src/MCStudies/Simple_Osc.h b/old_src/MCStudies/Simple_Osc.h
similarity index 100%
rename from src/MCStudies/Simple_Osc.h
rename to old_src/MCStudies/Simple_Osc.h
diff --git a/src/MCStudies/Smear_SVDUnfold_Propagation_Osc.cxx b/old_src/MCStudies/Smear_SVDUnfold_Propagation_Osc.cxx
similarity index 100%
rename from src/MCStudies/Smear_SVDUnfold_Propagation_Osc.cxx
rename to old_src/MCStudies/Smear_SVDUnfold_Propagation_Osc.cxx
diff --git a/src/MCStudies/Smear_SVDUnfold_Propagation_Osc.h b/old_src/MCStudies/Smear_SVDUnfold_Propagation_Osc.h
similarity index 100%
rename from src/MCStudies/Smear_SVDUnfold_Propagation_Osc.h
rename to old_src/MCStudies/Smear_SVDUnfold_Propagation_Osc.h
diff --git a/src/MCStudies/Smearceptance_Tester.cxx b/old_src/MCStudies/Smearceptance_Tester.cxx
similarity index 100%
rename from src/MCStudies/Smearceptance_Tester.cxx
rename to old_src/MCStudies/Smearceptance_Tester.cxx
diff --git a/src/MCStudies/Smearceptance_Tester.h b/old_src/MCStudies/Smearceptance_Tester.h
similarity index 100%
rename from src/MCStudies/Smearceptance_Tester.h
rename to old_src/MCStudies/Smearceptance_Tester.h
diff --git a/src/MCStudies/T2K2017_FakeData.cxx b/old_src/MCStudies/T2K2017_FakeData.cxx
similarity index 100%
rename from src/MCStudies/T2K2017_FakeData.cxx
rename to old_src/MCStudies/T2K2017_FakeData.cxx
diff --git a/src/MCStudies/T2K2017_FakeData.h b/old_src/MCStudies/T2K2017_FakeData.h
similarity index 100%
rename from src/MCStudies/T2K2017_FakeData.h
rename to old_src/MCStudies/T2K2017_FakeData.h
diff --git a/src/MINERvA/CMakeLists.txt b/old_src/MINERvA/CMakeLists.txt
similarity index 100%
rename from src/MINERvA/CMakeLists.txt
rename to old_src/MINERvA/CMakeLists.txt
diff --git a/src/MINERvA/MINERvAUtils.cxx b/old_src/MINERvA/MINERvAUtils.cxx
similarity index 100%
rename from src/MINERvA/MINERvAUtils.cxx
rename to old_src/MINERvA/MINERvAUtils.cxx
diff --git a/src/MINERvA/MINERvAUtils.h b/old_src/MINERvA/MINERvAUtils.h
similarity index 100%
rename from src/MINERvA/MINERvAUtils.h
rename to old_src/MINERvA/MINERvAUtils.h
diff --git a/src/MINERvA/MINERvAVariableBoxes.h b/old_src/MINERvA/MINERvAVariableBoxes.h
similarity index 100%
rename from src/MINERvA/MINERvAVariableBoxes.h
rename to old_src/MINERvA/MINERvAVariableBoxes.h
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.cxx b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.cxx
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.cxx
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.h b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.h
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DEe_nue.h
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.cxx b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.cxx
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.cxx
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.h b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.h
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.h
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_Tgt_nu.cxx b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_Tgt_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_Tgt_nu.cxx
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_Tgt_nu.cxx
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_Tgt_nu.h b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_Tgt_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_Tgt_nu.h
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_Tgt_nu.h
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.cxx b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.cxx
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.cxx
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.h b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.h
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nu_proton.h
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.cxx b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.cxx
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.cxx
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.h b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.h
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DQ2_nue.h
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.cxx b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.cxx
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.cxx
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.h b/old_src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.h
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_1DThetae_nue.h
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_antinu.cxx b/old_src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_antinu.cxx
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_antinu.h b/old_src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_antinu.h
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_antinu.h
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.cxx b/old_src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.cxx
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.cxx
diff --git a/src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.h b/old_src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.h
rename to old_src/MINERvA/MINERvA_CC0pi_XSec_2Dptpx_nu.h
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.cxx b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.cxx
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.h b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.h
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1DEnu_antinu.h
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.cxx b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.cxx
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.h b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.h
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1DQ2_antinu.h
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1DTpi0_antinu.cxx b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1DTpi0_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1DTpi0_antinu.cxx
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1DTpi0_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1DTpi0_antinu.h b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1DTpi0_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1DTpi0_antinu.h
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1DTpi0_antinu.h
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.cxx b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.cxx
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.h b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.h
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1D_nu.h
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.cxx b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.cxx
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.h b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.h
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dpmu_antinu.h
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.cxx b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.cxx
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.h b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.h
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dppi0_antinu.h
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.cxx b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.cxx
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.h b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.h
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dth_antinu.h
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.cxx b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.cxx
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.h b/old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.h
rename to old_src/MINERvA/MINERvA_CC1pi0_XSec_1Dthmu_antinu.h
diff --git a/src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_20deg_nu.cxx b/old_src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_20deg_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_20deg_nu.cxx
rename to old_src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_20deg_nu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_20deg_nu.h b/old_src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_20deg_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_20deg_nu.h
rename to old_src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_20deg_nu.h
diff --git a/src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_nu.cxx b/old_src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_nu.cxx
rename to old_src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_nu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_nu.h b/old_src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_nu.h
rename to old_src/MINERvA/MINERvA_CC1pip_XSec_1DTpi_nu.h
diff --git a/src/MINERvA/MINERvA_CC1pip_XSec_1D_2017Update.cxx b/old_src/MINERvA/MINERvA_CC1pip_XSec_1D_2017Update.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pip_XSec_1D_2017Update.cxx
rename to old_src/MINERvA/MINERvA_CC1pip_XSec_1D_2017Update.cxx
diff --git a/src/MINERvA/MINERvA_CC1pip_XSec_1D_2017Update.h b/old_src/MINERvA/MINERvA_CC1pip_XSec_1D_2017Update.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pip_XSec_1D_2017Update.h
rename to old_src/MINERvA/MINERvA_CC1pip_XSec_1D_2017Update.h
diff --git a/src/MINERvA/MINERvA_CC1pip_XSec_1Dth_20deg_nu.cxx b/old_src/MINERvA/MINERvA_CC1pip_XSec_1Dth_20deg_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pip_XSec_1Dth_20deg_nu.cxx
rename to old_src/MINERvA/MINERvA_CC1pip_XSec_1Dth_20deg_nu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pip_XSec_1Dth_20deg_nu.h b/old_src/MINERvA/MINERvA_CC1pip_XSec_1Dth_20deg_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pip_XSec_1Dth_20deg_nu.h
rename to old_src/MINERvA/MINERvA_CC1pip_XSec_1Dth_20deg_nu.h
diff --git a/src/MINERvA/MINERvA_CC1pip_XSec_1Dth_nu.cxx b/old_src/MINERvA/MINERvA_CC1pip_XSec_1Dth_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pip_XSec_1Dth_nu.cxx
rename to old_src/MINERvA/MINERvA_CC1pip_XSec_1Dth_nu.cxx
diff --git a/src/MINERvA/MINERvA_CC1pip_XSec_1Dth_nu.h b/old_src/MINERvA/MINERvA_CC1pip_XSec_1Dth_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CC1pip_XSec_1Dth_nu.h
rename to old_src/MINERvA/MINERvA_CC1pip_XSec_1Dth_nu.h
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.cxx b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.cxx
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.h b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.h
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.h
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.cxx b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.cxx
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.h b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.h
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.h
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.cxx b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.cxx
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.h b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.h
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.h
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.cxx b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.cxx
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.h b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.h
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.h
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_antinu.cxx b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_antinu.cxx
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_antinu.h b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_antinu.h
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_antinu.h
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_nu.cxx b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_nu.cxx
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_nu.h b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_nu.h
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1DQ2_nu.h
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.cxx b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.cxx
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.h b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.h
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.h
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.cxx b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.cxx
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.h b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.h
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.h
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_joint.cxx b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_joint.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_joint.cxx
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_joint.cxx
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_joint.h b/old_src/MINERvA/MINERvA_CCCOHPI_XSec_joint.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCCOHPI_XSec_joint.h
rename to old_src/MINERvA/MINERvA_CCCOHPI_XSec_joint.h
diff --git a/src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_nu.cxx b/old_src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_nu.cxx
rename to old_src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_nu.h b/old_src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_nu.h
rename to old_src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_nu.h
diff --git a/src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_ratio.cxx b/old_src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_ratio.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_ratio.cxx
rename to old_src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_ratio.cxx
diff --git a/src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_ratio.h b/old_src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_ratio.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_ratio.h
rename to old_src/MINERvA/MINERvA_CCDIS_XSec_1DEnu_ratio.h
diff --git a/src/MINERvA/MINERvA_CCDIS_XSec_1Dx_nu.cxx b/old_src/MINERvA/MINERvA_CCDIS_XSec_1Dx_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCDIS_XSec_1Dx_nu.cxx
rename to old_src/MINERvA/MINERvA_CCDIS_XSec_1Dx_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCDIS_XSec_1Dx_nu.h b/old_src/MINERvA/MINERvA_CCDIS_XSec_1Dx_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCDIS_XSec_1Dx_nu.h
rename to old_src/MINERvA/MINERvA_CCDIS_XSec_1Dx_nu.h
diff --git a/src/MINERvA/MINERvA_CCDIS_XSec_1Dx_ratio.cxx b/old_src/MINERvA/MINERvA_CCDIS_XSec_1Dx_ratio.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCDIS_XSec_1Dx_ratio.cxx
rename to old_src/MINERvA/MINERvA_CCDIS_XSec_1Dx_ratio.cxx
diff --git a/src/MINERvA/MINERvA_CCDIS_XSec_1Dx_ratio.h b/old_src/MINERvA/MINERvA_CCDIS_XSec_1Dx_ratio.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCDIS_XSec_1Dx_ratio.h
rename to old_src/MINERvA/MINERvA_CCDIS_XSec_1Dx_ratio.h
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.cxx b/old_src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.cxx
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.h b/old_src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.h
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1DEnu_nu.h
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.cxx b/old_src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.cxx
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.h b/old_src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.h
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1DQ2_nu.h
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.cxx b/old_src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.cxx
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.h b/old_src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.h
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1DTpi_nu.h
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.cxx b/old_src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.cxx
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.h b/old_src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.h
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1Dpmu_nu.h
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1Dth_nu.cxx b/old_src/MINERvA/MINERvA_CCNpip_XSec_1Dth_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1Dth_nu.cxx
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1Dth_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1Dth_nu.h b/old_src/MINERvA/MINERvA_CCNpip_XSec_1Dth_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1Dth_nu.h
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1Dth_nu.h
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1Dthmu_nu.cxx b/old_src/MINERvA/MINERvA_CCNpip_XSec_1Dthmu_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1Dthmu_nu.cxx
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1Dthmu_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCNpip_XSec_1Dthmu_nu.h b/old_src/MINERvA/MINERvA_CCNpip_XSec_1Dthmu_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCNpip_XSec_1Dthmu_nu.h
rename to old_src/MINERvA/MINERvA_CCNpip_XSec_1Dthmu_nu.h
diff --git a/src/MINERvA/MINERvA_CCQE_XSec_1DQ2_antinu.cxx b/old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_antinu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCQE_XSec_1DQ2_antinu.cxx
rename to old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_antinu.cxx
diff --git a/src/MINERvA/MINERvA_CCQE_XSec_1DQ2_antinu.h b/old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_antinu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCQE_XSec_1DQ2_antinu.h
rename to old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_antinu.h
diff --git a/src/MINERvA/MINERvA_CCQE_XSec_1DQ2_joint.cxx b/old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_joint.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCQE_XSec_1DQ2_joint.cxx
rename to old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_joint.cxx
diff --git a/src/MINERvA/MINERvA_CCQE_XSec_1DQ2_joint.h b/old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_joint.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCQE_XSec_1DQ2_joint.h
rename to old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_joint.h
diff --git a/src/MINERvA/MINERvA_CCQE_XSec_1DQ2_nu.cxx b/old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCQE_XSec_1DQ2_nu.cxx
rename to old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCQE_XSec_1DQ2_nu.h b/old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCQE_XSec_1DQ2_nu.h
rename to old_src/MINERvA/MINERvA_CCQE_XSec_1DQ2_nu.h
diff --git a/src/MINERvA/MINERvA_CCinc_XSec_1DEnu_nu.cxx b/old_src/MINERvA/MINERvA_CCinc_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCinc_XSec_1DEnu_nu.cxx
rename to old_src/MINERvA/MINERvA_CCinc_XSec_1DEnu_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCinc_XSec_1DEnu_nu.h b/old_src/MINERvA/MINERvA_CCinc_XSec_1DEnu_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCinc_XSec_1DEnu_nu.h
rename to old_src/MINERvA/MINERvA_CCinc_XSec_1DEnu_nu.h
diff --git a/src/MINERvA/MINERvA_CCinc_XSec_1DEnu_ratio.cxx b/old_src/MINERvA/MINERvA_CCinc_XSec_1DEnu_ratio.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCinc_XSec_1DEnu_ratio.cxx
rename to old_src/MINERvA/MINERvA_CCinc_XSec_1DEnu_ratio.cxx
diff --git a/src/MINERvA/MINERvA_CCinc_XSec_1DEnu_ratio.h b/old_src/MINERvA/MINERvA_CCinc_XSec_1DEnu_ratio.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCinc_XSec_1DEnu_ratio.h
rename to old_src/MINERvA/MINERvA_CCinc_XSec_1DEnu_ratio.h
diff --git a/src/MINERvA/MINERvA_CCinc_XSec_1Dx_nu.cxx b/old_src/MINERvA/MINERvA_CCinc_XSec_1Dx_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCinc_XSec_1Dx_nu.cxx
rename to old_src/MINERvA/MINERvA_CCinc_XSec_1Dx_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCinc_XSec_1Dx_nu.h b/old_src/MINERvA/MINERvA_CCinc_XSec_1Dx_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCinc_XSec_1Dx_nu.h
rename to old_src/MINERvA/MINERvA_CCinc_XSec_1Dx_nu.h
diff --git a/src/MINERvA/MINERvA_CCinc_XSec_1Dx_ratio.cxx b/old_src/MINERvA/MINERvA_CCinc_XSec_1Dx_ratio.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCinc_XSec_1Dx_ratio.cxx
rename to old_src/MINERvA/MINERvA_CCinc_XSec_1Dx_ratio.cxx
diff --git a/src/MINERvA/MINERvA_CCinc_XSec_1Dx_ratio.h b/old_src/MINERvA/MINERvA_CCinc_XSec_1Dx_ratio.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCinc_XSec_1Dx_ratio.h
rename to old_src/MINERvA/MINERvA_CCinc_XSec_1Dx_ratio.h
diff --git a/src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.cxx b/old_src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.cxx
rename to old_src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.cxx
diff --git a/src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.h b/old_src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.h
similarity index 100%
rename from src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.h
rename to old_src/MINERvA/MINERvA_CCinc_XSec_2DEavq3_nu.h
diff --git a/src/MINERvA/MINERvA_SignalDef.cxx b/old_src/MINERvA/MINERvA_SignalDef.cxx
similarity index 100%
rename from src/MINERvA/MINERvA_SignalDef.cxx
rename to old_src/MINERvA/MINERvA_SignalDef.cxx
diff --git a/src/MINERvA/MINERvA_SignalDef.h b/old_src/MINERvA/MINERvA_SignalDef.h
similarity index 100%
rename from src/MINERvA/MINERvA_SignalDef.h
rename to old_src/MINERvA/MINERvA_SignalDef.h
diff --git a/src/MiniBooNE/CMakeLists.txt b/old_src/MiniBooNE/CMakeLists.txt
similarity index 100%
rename from src/MiniBooNE/CMakeLists.txt
rename to old_src/MiniBooNE/CMakeLists.txt
diff --git a/src/MiniBooNE/MiniBooNE_Boxes.h b/old_src/MiniBooNE/MiniBooNE_Boxes.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_Boxes.h
rename to old_src/MiniBooNE/MiniBooNE_Boxes.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DEnu_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DEnu_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DEnu_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DEnu_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DEnu_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DEnu_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DEnu_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DQ2_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DQ2_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DQ2_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DQ2_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DQ2_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DQ2_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DQ2_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DTu_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DTu_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DTu_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DTu_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DTu_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DTu_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DTu_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1DTu_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dppi0_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dppi0_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dppi0_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dppi0_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dppi0_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dppi0_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dppi0_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pi0_XSec_1Dppi0_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DEnu_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DEnu_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DEnu_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DEnu_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DEnu_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DEnu_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DEnu_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DEnu_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DQ2_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DQ2_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DQ2_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DQ2_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DQ2_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DQ2_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DQ2_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTpi_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTpi_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTpi_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTpi_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTpi_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTpi_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTpi_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTpi_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTu_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTu_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTu_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTu_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTu_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTu_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTu_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_1DTu_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DQ2Enu_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DQ2Enu_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DQ2Enu_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DQ2Enu_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DQ2Enu_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DQ2Enu_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DQ2Enu_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DQ2Enu_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuEnu_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuEnu_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuEnu_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuEnu_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuEnu_nu.h b/old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuEnu_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuEnu_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CC1pip_XSec_2DTuEnu_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_antinu.cxx b/old_src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_antinu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_antinu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_antinu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_antinu.h b/old_src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_antinu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_antinu.h
rename to old_src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_antinu.h
diff --git a/src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_nu.h b/old_src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CCQE_XSec_1DQ2_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_antinu.cxx b/old_src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_antinu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_antinu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_antinu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_antinu.h b/old_src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_antinu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_antinu.h
rename to old_src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_antinu.h
diff --git a/src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_nu.cxx b/old_src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_nu.h b/old_src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_nu.h
rename to old_src/MiniBooNE/MiniBooNE_CCQE_XSec_2DTcos_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx b/old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx
rename to old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.h b/old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.h
rename to old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.h
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx b/old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.h b/old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.h
rename to old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx b/old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx
rename to old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.h b/old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.h
rename to old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.h
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx b/old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.h b/old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.h
rename to old_src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.cxx b/old_src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.h b/old_src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.h
rename to old_src/MiniBooNE/MiniBooNE_NCEL_XSec_Treco_nu.h
diff --git a/src/MiniBooNE/MiniBooNE_NCpi0_XSec_1Dppi0_nu.cxx b/old_src/MiniBooNE/MiniBooNE_NCpi0_XSec_1Dppi0_nu.cxx
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NCpi0_XSec_1Dppi0_nu.cxx
rename to old_src/MiniBooNE/MiniBooNE_NCpi0_XSec_1Dppi0_nu.cxx
diff --git a/src/MiniBooNE/MiniBooNE_NCpi0_XSec_1Dppi0_nu.h b/old_src/MiniBooNE/MiniBooNE_NCpi0_XSec_1Dppi0_nu.h
similarity index 100%
rename from src/MiniBooNE/MiniBooNE_NCpi0_XSec_1Dppi0_nu.h
rename to old_src/MiniBooNE/MiniBooNE_NCpi0_XSec_1Dppi0_nu.h
diff --git a/src/MiniBooNE/SAMPLEREADME b/old_src/MiniBooNE/SAMPLEREADME
similarity index 100%
rename from src/MiniBooNE/SAMPLEREADME
rename to old_src/MiniBooNE/SAMPLEREADME
diff --git a/src/MiniBooNE/SampleSettings.cxx b/old_src/MiniBooNE/SampleSettings.cxx
similarity index 100%
rename from src/MiniBooNE/SampleSettings.cxx
rename to old_src/MiniBooNE/SampleSettings.cxx
diff --git a/src/MiniBooNE/SampleSettings.h b/old_src/MiniBooNE/SampleSettings.h
similarity index 100%
rename from src/MiniBooNE/SampleSettings.h
rename to old_src/MiniBooNE/SampleSettings.h
diff --git a/src/Reweight/CMakeLists.txt b/old_src/Reweight/CMakeLists.txt
similarity index 100%
rename from src/Reweight/CMakeLists.txt
rename to old_src/Reweight/CMakeLists.txt
diff --git a/src/Reweight/DUNERwtWeightEngine.cxx b/old_src/Reweight/DUNERwtWeightEngine.cxx
similarity index 100%
rename from src/Reweight/DUNERwtWeightEngine.cxx
rename to old_src/Reweight/DUNERwtWeightEngine.cxx
diff --git a/src/Reweight/DUNERwtWeightEngine.h b/old_src/Reweight/DUNERwtWeightEngine.h
similarity index 100%
rename from src/Reweight/DUNERwtWeightEngine.h
rename to old_src/Reweight/DUNERwtWeightEngine.h
diff --git a/src/Reweight/FitWeight.cxx b/old_src/Reweight/FitWeight.cxx
similarity index 100%
rename from src/Reweight/FitWeight.cxx
rename to old_src/Reweight/FitWeight.cxx
diff --git a/src/Reweight/FitWeight.h b/old_src/Reweight/FitWeight.h
similarity index 100%
rename from src/Reweight/FitWeight.h
rename to old_src/Reweight/FitWeight.h
diff --git a/src/Reweight/GENIEWeightEngine.cxx b/old_src/Reweight/GENIEWeightEngine.cxx
similarity index 100%
rename from src/Reweight/GENIEWeightEngine.cxx
rename to old_src/Reweight/GENIEWeightEngine.cxx
diff --git a/src/Reweight/GENIEWeightEngine.h b/old_src/Reweight/GENIEWeightEngine.h
similarity index 100%
rename from src/Reweight/GENIEWeightEngine.h
rename to old_src/Reweight/GENIEWeightEngine.h
diff --git a/src/Reweight/GlobalDialList.cxx b/old_src/Reweight/GlobalDialList.cxx
similarity index 100%
rename from src/Reweight/GlobalDialList.cxx
rename to old_src/Reweight/GlobalDialList.cxx
diff --git a/src/Reweight/GlobalDialList.h b/old_src/Reweight/GlobalDialList.h
similarity index 100%
rename from src/Reweight/GlobalDialList.h
rename to old_src/Reweight/GlobalDialList.h
diff --git a/src/Reweight/LikelihoodWeightEngine.cxx b/old_src/Reweight/LikelihoodWeightEngine.cxx
similarity index 100%
rename from src/Reweight/LikelihoodWeightEngine.cxx
rename to old_src/Reweight/LikelihoodWeightEngine.cxx
diff --git a/src/Reweight/LikelihoodWeightEngine.h b/old_src/Reweight/LikelihoodWeightEngine.h
similarity index 100%
rename from src/Reweight/LikelihoodWeightEngine.h
rename to old_src/Reweight/LikelihoodWeightEngine.h
diff --git a/src/Reweight/MINERvAWeightCalcs.cxx b/old_src/Reweight/MINERvAWeightCalcs.cxx
similarity index 100%
rename from src/Reweight/MINERvAWeightCalcs.cxx
rename to old_src/Reweight/MINERvAWeightCalcs.cxx
diff --git a/src/Reweight/MINERvAWeightCalcs.h b/old_src/Reweight/MINERvAWeightCalcs.h
similarity index 100%
rename from src/Reweight/MINERvAWeightCalcs.h
rename to old_src/Reweight/MINERvAWeightCalcs.h
diff --git a/src/Reweight/ModeNormEngine.h b/old_src/Reweight/ModeNormEngine.h
similarity index 100%
rename from src/Reweight/ModeNormEngine.h
rename to old_src/Reweight/ModeNormEngine.h
diff --git a/src/Reweight/NEUTWeightEngine.cxx b/old_src/Reweight/NEUTWeightEngine.cxx
similarity index 100%
rename from src/Reweight/NEUTWeightEngine.cxx
rename to old_src/Reweight/NEUTWeightEngine.cxx
diff --git a/src/Reweight/NEUTWeightEngine.h b/old_src/Reweight/NEUTWeightEngine.h
similarity index 100%
rename from src/Reweight/NEUTWeightEngine.h
rename to old_src/Reweight/NEUTWeightEngine.h
diff --git a/src/Reweight/NIWGWeightEngine.cxx b/old_src/Reweight/NIWGWeightEngine.cxx
similarity index 100%
rename from src/Reweight/NIWGWeightEngine.cxx
rename to old_src/Reweight/NIWGWeightEngine.cxx
diff --git a/src/Reweight/NIWGWeightEngine.h b/old_src/Reweight/NIWGWeightEngine.h
similarity index 100%
rename from src/Reweight/NIWGWeightEngine.h
rename to old_src/Reweight/NIWGWeightEngine.h
diff --git a/src/Reweight/NUISANCESyst.cxx b/old_src/Reweight/NUISANCESyst.cxx
similarity index 100%
rename from src/Reweight/NUISANCESyst.cxx
rename to old_src/Reweight/NUISANCESyst.cxx
diff --git a/src/Reweight/NUISANCESyst.h b/old_src/Reweight/NUISANCESyst.h
similarity index 100%
rename from src/Reweight/NUISANCESyst.h
rename to old_src/Reweight/NUISANCESyst.h
diff --git a/src/Reweight/NUISANCEWeightCalcs.cxx b/old_src/Reweight/NUISANCEWeightCalcs.cxx
similarity index 100%
rename from src/Reweight/NUISANCEWeightCalcs.cxx
rename to old_src/Reweight/NUISANCEWeightCalcs.cxx
diff --git a/src/Reweight/NUISANCEWeightCalcs.h b/old_src/Reweight/NUISANCEWeightCalcs.h
similarity index 100%
rename from src/Reweight/NUISANCEWeightCalcs.h
rename to old_src/Reweight/NUISANCEWeightCalcs.h
diff --git a/src/Reweight/NUISANCEWeightEngine.cxx b/old_src/Reweight/NUISANCEWeightEngine.cxx
similarity index 100%
rename from src/Reweight/NUISANCEWeightEngine.cxx
rename to old_src/Reweight/NUISANCEWeightEngine.cxx
diff --git a/src/Reweight/NUISANCEWeightEngine.h b/old_src/Reweight/NUISANCEWeightEngine.h
similarity index 100%
rename from src/Reweight/NUISANCEWeightEngine.h
rename to old_src/Reweight/NUISANCEWeightEngine.h
diff --git a/src/Reweight/NuWroWeightEngine.cxx b/old_src/Reweight/NuWroWeightEngine.cxx
similarity index 100%
rename from src/Reweight/NuWroWeightEngine.cxx
rename to old_src/Reweight/NuWroWeightEngine.cxx
diff --git a/src/Reweight/NuWroWeightEngine.h b/old_src/Reweight/NuWroWeightEngine.h
similarity index 100%
rename from src/Reweight/NuWroWeightEngine.h
rename to old_src/Reweight/NuWroWeightEngine.h
diff --git a/src/Reweight/OscWeightEngine.cxx b/old_src/Reweight/OscWeightEngine.cxx
similarity index 100%
rename from src/Reweight/OscWeightEngine.cxx
rename to old_src/Reweight/OscWeightEngine.cxx
diff --git a/src/Reweight/OscWeightEngine.h b/old_src/Reweight/OscWeightEngine.h
similarity index 100%
rename from src/Reweight/OscWeightEngine.h
rename to old_src/Reweight/OscWeightEngine.h
diff --git a/src/Reweight/SampleNormEngine.cxx b/old_src/Reweight/SampleNormEngine.cxx
similarity index 100%
rename from src/Reweight/SampleNormEngine.cxx
rename to old_src/Reweight/SampleNormEngine.cxx
diff --git a/src/Reweight/SampleNormEngine.h b/old_src/Reweight/SampleNormEngine.h
similarity index 100%
rename from src/Reweight/SampleNormEngine.h
rename to old_src/Reweight/SampleNormEngine.h
diff --git a/src/Reweight/SplineWeightEngine.cxx b/old_src/Reweight/SplineWeightEngine.cxx
similarity index 100%
rename from src/Reweight/SplineWeightEngine.cxx
rename to old_src/Reweight/SplineWeightEngine.cxx
diff --git a/src/Reweight/SplineWeightEngine.h b/old_src/Reweight/SplineWeightEngine.h
similarity index 100%
rename from src/Reweight/SplineWeightEngine.h
rename to old_src/Reweight/SplineWeightEngine.h
diff --git a/src/Reweight/T2KWeightEngine.cxx b/old_src/Reweight/T2KWeightEngine.cxx
similarity index 100%
rename from src/Reweight/T2KWeightEngine.cxx
rename to old_src/Reweight/T2KWeightEngine.cxx
diff --git a/src/Reweight/T2KWeightEngine.h b/old_src/Reweight/T2KWeightEngine.h
similarity index 100%
rename from src/Reweight/T2KWeightEngine.h
rename to old_src/Reweight/T2KWeightEngine.h
diff --git a/src/Reweight/WeightEngineBase.cxx b/old_src/Reweight/WeightEngineBase.cxx
similarity index 100%
rename from src/Reweight/WeightEngineBase.cxx
rename to old_src/Reweight/WeightEngineBase.cxx
diff --git a/src/Reweight/WeightEngineBase.h b/old_src/Reweight/WeightEngineBase.h
similarity index 100%
rename from src/Reweight/WeightEngineBase.h
rename to old_src/Reweight/WeightEngineBase.h
diff --git a/src/Reweight/WeightUtils.cxx b/old_src/Reweight/WeightUtils.cxx
similarity index 100%
rename from src/Reweight/WeightUtils.cxx
rename to old_src/Reweight/WeightUtils.cxx
diff --git a/src/Reweight/WeightUtils.h b/old_src/Reweight/WeightUtils.h
similarity index 100%
rename from src/Reweight/WeightUtils.h
rename to old_src/Reweight/WeightUtils.h
diff --git a/src/Reweight/weightRPA.h b/old_src/Reweight/weightRPA.h
similarity index 100%
rename from src/Reweight/weightRPA.h
rename to old_src/Reweight/weightRPA.h
diff --git a/src/Routines/._CMakeLists.txt~ b/old_src/Routines/._CMakeLists.txt~
similarity index 100%
rename from src/Routines/._CMakeLists.txt~
rename to old_src/Routines/._CMakeLists.txt~
diff --git a/src/Routines/BayesianRoutines.cxx b/old_src/Routines/BayesianRoutines.cxx
similarity index 100%
rename from src/Routines/BayesianRoutines.cxx
rename to old_src/Routines/BayesianRoutines.cxx
diff --git a/src/Routines/BayesianRoutines.h b/old_src/Routines/BayesianRoutines.h
similarity index 100%
rename from src/Routines/BayesianRoutines.h
rename to old_src/Routines/BayesianRoutines.h
diff --git a/src/Routines/CMakeLists.txt b/old_src/Routines/CMakeLists.txt
similarity index 100%
rename from src/Routines/CMakeLists.txt
rename to old_src/Routines/CMakeLists.txt
diff --git a/src/Routines/ComparisonRoutines.cxx b/old_src/Routines/ComparisonRoutines.cxx
similarity index 100%
rename from src/Routines/ComparisonRoutines.cxx
rename to old_src/Routines/ComparisonRoutines.cxx
diff --git a/src/Routines/ComparisonRoutines.h b/old_src/Routines/ComparisonRoutines.h
similarity index 100%
rename from src/Routines/ComparisonRoutines.h
rename to old_src/Routines/ComparisonRoutines.h
diff --git a/src/Routines/MinimizerRoutines.cxx b/old_src/Routines/MinimizerRoutines.cxx
similarity index 100%
rename from src/Routines/MinimizerRoutines.cxx
rename to old_src/Routines/MinimizerRoutines.cxx
diff --git a/src/Routines/MinimizerRoutines.h b/old_src/Routines/MinimizerRoutines.h
similarity index 100%
rename from src/Routines/MinimizerRoutines.h
rename to old_src/Routines/MinimizerRoutines.h
diff --git a/src/Routines/Simple_MH_Sampler.h b/old_src/Routines/Simple_MH_Sampler.h
similarity index 100%
rename from src/Routines/Simple_MH_Sampler.h
rename to old_src/Routines/Simple_MH_Sampler.h
diff --git a/src/Routines/SplineRoutines.cxx b/old_src/Routines/SplineRoutines.cxx
similarity index 100%
rename from src/Routines/SplineRoutines.cxx
rename to old_src/Routines/SplineRoutines.cxx
diff --git a/src/Routines/SplineRoutines.h b/old_src/Routines/SplineRoutines.h
similarity index 100%
rename from src/Routines/SplineRoutines.h
rename to old_src/Routines/SplineRoutines.h
diff --git a/src/Routines/SystematicRoutines.cxx b/old_src/Routines/SystematicRoutines.cxx
similarity index 100%
rename from src/Routines/SystematicRoutines.cxx
rename to old_src/Routines/SystematicRoutines.cxx
diff --git a/src/Routines/SystematicRoutines.h b/old_src/Routines/SystematicRoutines.h
similarity index 100%
rename from src/Routines/SystematicRoutines.h
rename to old_src/Routines/SystematicRoutines.h
diff --git a/src/SciBooNE/CMakeLists.txt b/old_src/SciBooNE/CMakeLists.txt
similarity index 100%
rename from src/SciBooNE/CMakeLists.txt
rename to old_src/SciBooNE/CMakeLists.txt
diff --git a/src/SciBooNE/SciBooNEUtils.cxx b/old_src/SciBooNE/SciBooNEUtils.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNEUtils.cxx
rename to old_src/SciBooNE/SciBooNEUtils.cxx
diff --git a/src/SciBooNE/SciBooNEUtils.h b/old_src/SciBooNE/SciBooNEUtils.h
similarity index 100%
rename from src/SciBooNE/SciBooNEUtils.h
rename to old_src/SciBooNE/SciBooNEUtils.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_1TRK_1DQ2_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1DQ2_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_1TRK_1DQ2_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1DQ2_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_1TRK_1DQ2_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1DQ2_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_1TRK_1DQ2_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1DQ2_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dpmu_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dpmu_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dpmu_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dpmu_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dpmu_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dpmu_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dpmu_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dpmu_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dthetamu_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dthetamu_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dthetamu_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dthetamu_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dthetamu_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dthetamu_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dthetamu_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_1TRK_1Dthetamu_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dpmu_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dpmu_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dpmu_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dpmu_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dpmu_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dpmu_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dpmu_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dpmu_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetamu_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetamu_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetamu_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetamu_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetamu_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetamu_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetamu_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetamu_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1DQ2_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1DQ2_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1DQ2_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1DQ2_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1DQ2_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1DQ2_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1DQ2_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1DQ2_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dpmu_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dpmu_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dpmu_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dpmu_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dpmu_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dpmu_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dpmu_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dpmu_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dthetamu_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dthetamu_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dthetamu_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dthetamu_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dthetamu_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dthetamu_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dthetamu_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPiVA_1Dthetamu_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPr_1DQ2_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1DQ2_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPr_1DQ2_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1DQ2_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPr_1DQ2_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1DQ2_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPr_1DQ2_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1DQ2_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dpmu_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dpmu_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dpmu_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dpmu_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dpmu_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dpmu_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dpmu_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dpmu_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dthetamu_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dthetamu_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dthetamu_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dthetamu_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dthetamu_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dthetamu_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dthetamu_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_MuPr_1Dthetamu_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_STOPFINAL_1DQ2_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_STOPFINAL_1DQ2_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_STOPFINAL_1DQ2_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_STOPFINAL_1DQ2_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_STOPFINAL_1DQ2_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_STOPFINAL_1DQ2_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_STOPFINAL_1DQ2_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_STOPFINAL_1DQ2_nu.h
diff --git a/src/SciBooNE/SciBooNE_CCCOH_STOP_NTrks_nu.cxx b/old_src/SciBooNE/SciBooNE_CCCOH_STOP_NTrks_nu.cxx
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_STOP_NTrks_nu.cxx
rename to old_src/SciBooNE/SciBooNE_CCCOH_STOP_NTrks_nu.cxx
diff --git a/src/SciBooNE/SciBooNE_CCCOH_STOP_NTrks_nu.h b/old_src/SciBooNE/SciBooNE_CCCOH_STOP_NTrks_nu.h
similarity index 100%
rename from src/SciBooNE/SciBooNE_CCCOH_STOP_NTrks_nu.h
rename to old_src/SciBooNE/SciBooNE_CCCOH_STOP_NTrks_nu.h
diff --git a/src/Smearceptance/CMakeLists.txt b/old_src/Smearceptance/CMakeLists.txt
similarity index 100%
rename from src/Smearceptance/CMakeLists.txt
rename to old_src/Smearceptance/CMakeLists.txt
diff --git a/src/Smearceptance/EfficiencyApplicator.cxx b/old_src/Smearceptance/EfficiencyApplicator.cxx
similarity index 100%
rename from src/Smearceptance/EfficiencyApplicator.cxx
rename to old_src/Smearceptance/EfficiencyApplicator.cxx
diff --git a/src/Smearceptance/EfficiencyApplicator.h b/old_src/Smearceptance/EfficiencyApplicator.h
similarity index 100%
rename from src/Smearceptance/EfficiencyApplicator.h
rename to old_src/Smearceptance/EfficiencyApplicator.h
diff --git a/src/Smearceptance/EnergyShuffler.cxx b/old_src/Smearceptance/EnergyShuffler.cxx
similarity index 100%
rename from src/Smearceptance/EnergyShuffler.cxx
rename to old_src/Smearceptance/EnergyShuffler.cxx
diff --git a/src/Smearceptance/EnergyShuffler.h b/old_src/Smearceptance/EnergyShuffler.h
similarity index 100%
rename from src/Smearceptance/EnergyShuffler.h
rename to old_src/Smearceptance/EnergyShuffler.h
diff --git a/src/Smearceptance/GaussianSmearer.cxx b/old_src/Smearceptance/GaussianSmearer.cxx
similarity index 100%
rename from src/Smearceptance/GaussianSmearer.cxx
rename to old_src/Smearceptance/GaussianSmearer.cxx
diff --git a/src/Smearceptance/GaussianSmearer.h b/old_src/Smearceptance/GaussianSmearer.h
similarity index 100%
rename from src/Smearceptance/GaussianSmearer.h
rename to old_src/Smearceptance/GaussianSmearer.h
diff --git a/src/Smearceptance/Hist2DSlice.cxx b/old_src/Smearceptance/Hist2DSlice.cxx
similarity index 100%
rename from src/Smearceptance/Hist2DSlice.cxx
rename to old_src/Smearceptance/Hist2DSlice.cxx
diff --git a/src/Smearceptance/Hist2DSlice.h b/old_src/Smearceptance/Hist2DSlice.h
similarity index 100%
rename from src/Smearceptance/Hist2DSlice.h
rename to old_src/Smearceptance/Hist2DSlice.h
diff --git a/src/Smearceptance/ISmearcepter.cxx b/old_src/Smearceptance/ISmearcepter.cxx
similarity index 100%
rename from src/Smearceptance/ISmearcepter.cxx
rename to old_src/Smearceptance/ISmearcepter.cxx
diff --git a/src/Smearceptance/ISmearcepter.h b/old_src/Smearceptance/ISmearcepter.h
similarity index 100%
rename from src/Smearceptance/ISmearcepter.h
rename to old_src/Smearceptance/ISmearcepter.h
diff --git a/src/Smearceptance/MetaSimpleSmearcepter.cxx b/old_src/Smearceptance/MetaSimpleSmearcepter.cxx
similarity index 100%
rename from src/Smearceptance/MetaSimpleSmearcepter.cxx
rename to old_src/Smearceptance/MetaSimpleSmearcepter.cxx
diff --git a/src/Smearceptance/MetaSimpleSmearcepter.h b/old_src/Smearceptance/MetaSimpleSmearcepter.h
similarity index 100%
rename from src/Smearceptance/MetaSimpleSmearcepter.h
rename to old_src/Smearceptance/MetaSimpleSmearcepter.h
diff --git a/src/Smearceptance/SmearceptanceUtils.cxx b/old_src/Smearceptance/SmearceptanceUtils.cxx
similarity index 100%
rename from src/Smearceptance/SmearceptanceUtils.cxx
rename to old_src/Smearceptance/SmearceptanceUtils.cxx
diff --git a/src/Smearceptance/SmearceptanceUtils.h b/old_src/Smearceptance/SmearceptanceUtils.h
similarity index 100%
rename from src/Smearceptance/SmearceptanceUtils.h
rename to old_src/Smearceptance/SmearceptanceUtils.h
diff --git a/src/Smearceptance/Smearcepterton.cxx b/old_src/Smearceptance/Smearcepterton.cxx
similarity index 100%
rename from src/Smearceptance/Smearcepterton.cxx
rename to old_src/Smearceptance/Smearcepterton.cxx
diff --git a/src/Smearceptance/Smearcepterton.h b/old_src/Smearceptance/Smearcepterton.h
similarity index 100%
rename from src/Smearceptance/Smearcepterton.h
rename to old_src/Smearceptance/Smearcepterton.h
diff --git a/src/Smearceptance/ThresholdAccepter.cxx b/old_src/Smearceptance/ThresholdAccepter.cxx
similarity index 100%
rename from src/Smearceptance/ThresholdAccepter.cxx
rename to old_src/Smearceptance/ThresholdAccepter.cxx
diff --git a/src/Smearceptance/ThresholdAccepter.h b/old_src/Smearceptance/ThresholdAccepter.h
similarity index 100%
rename from src/Smearceptance/ThresholdAccepter.h
rename to old_src/Smearceptance/ThresholdAccepter.h
diff --git a/src/Smearceptance/TrackedMomentumMatrixSmearer.cxx b/old_src/Smearceptance/TrackedMomentumMatrixSmearer.cxx
similarity index 100%
rename from src/Smearceptance/TrackedMomentumMatrixSmearer.cxx
rename to old_src/Smearceptance/TrackedMomentumMatrixSmearer.cxx
diff --git a/src/Smearceptance/TrackedMomentumMatrixSmearer.h b/old_src/Smearceptance/TrackedMomentumMatrixSmearer.h
similarity index 100%
rename from src/Smearceptance/TrackedMomentumMatrixSmearer.h
rename to old_src/Smearceptance/TrackedMomentumMatrixSmearer.h
diff --git a/src/Smearceptance/VisECoalescer.h b/old_src/Smearceptance/VisECoalescer.h
similarity index 100%
rename from src/Smearceptance/VisECoalescer.h
rename to old_src/Smearceptance/VisECoalescer.h
diff --git a/src/Smearceptance/smearceptance.md b/old_src/Smearceptance/smearceptance.md
similarity index 100%
rename from src/Smearceptance/smearceptance.md
rename to old_src/Smearceptance/smearceptance.md
diff --git a/src/Splines/CMakeLists.txt b/old_src/Splines/CMakeLists.txt
similarity index 100%
rename from src/Splines/CMakeLists.txt
rename to old_src/Splines/CMakeLists.txt
diff --git a/src/Splines/FitSpline.cxx b/old_src/Splines/FitSpline.cxx
similarity index 100%
rename from src/Splines/FitSpline.cxx
rename to old_src/Splines/FitSpline.cxx
diff --git a/src/Splines/FitSpline.h b/old_src/Splines/FitSpline.h
similarity index 100%
rename from src/Splines/FitSpline.h
rename to old_src/Splines/FitSpline.h
diff --git a/src/Splines/FitSplineHead.cxx b/old_src/Splines/FitSplineHead.cxx
similarity index 100%
rename from src/Splines/FitSplineHead.cxx
rename to old_src/Splines/FitSplineHead.cxx
diff --git a/src/Splines/FitSplineHead.h b/old_src/Splines/FitSplineHead.h
similarity index 100%
rename from src/Splines/FitSplineHead.h
rename to old_src/Splines/FitSplineHead.h
diff --git a/src/Splines/Spline.cxx b/old_src/Splines/Spline.cxx
similarity index 100%
rename from src/Splines/Spline.cxx
rename to old_src/Splines/Spline.cxx
diff --git a/src/Splines/Spline.h b/old_src/Splines/Spline.h
similarity index 100%
rename from src/Splines/Spline.h
rename to old_src/Splines/Spline.h
diff --git a/src/Splines/SplineMerger.cxx b/old_src/Splines/SplineMerger.cxx
similarity index 100%
rename from src/Splines/SplineMerger.cxx
rename to old_src/Splines/SplineMerger.cxx
diff --git a/src/Splines/SplineMerger.h b/old_src/Splines/SplineMerger.h
similarity index 100%
rename from src/Splines/SplineMerger.h
rename to old_src/Splines/SplineMerger.h
diff --git a/src/Splines/SplineReader.cxx b/old_src/Splines/SplineReader.cxx
similarity index 100%
rename from src/Splines/SplineReader.cxx
rename to old_src/Splines/SplineReader.cxx
diff --git a/src/Splines/SplineReader.h b/old_src/Splines/SplineReader.h
similarity index 100%
rename from src/Splines/SplineReader.h
rename to old_src/Splines/SplineReader.h
diff --git a/src/Splines/SplineUtils.cxx b/old_src/Splines/SplineUtils.cxx
similarity index 100%
rename from src/Splines/SplineUtils.cxx
rename to old_src/Splines/SplineUtils.cxx
diff --git a/src/Splines/SplineUtils.h b/old_src/Splines/SplineUtils.h
similarity index 100%
rename from src/Splines/SplineUtils.h
rename to old_src/Splines/SplineUtils.h
diff --git a/src/Splines/SplineWriter.cxx b/old_src/Splines/SplineWriter.cxx
similarity index 100%
rename from src/Splines/SplineWriter.cxx
rename to old_src/Splines/SplineWriter.cxx
diff --git a/src/Splines/SplineWriter.h b/old_src/Splines/SplineWriter.h
similarity index 100%
rename from src/Splines/SplineWriter.h
rename to old_src/Splines/SplineWriter.h
diff --git a/src/Splines/allsplines_mb.xml b/old_src/Splines/allsplines_mb.xml
similarity index 100%
rename from src/Splines/allsplines_mb.xml
rename to old_src/Splines/allsplines_mb.xml
diff --git a/src/Splines/bnl_splines.xml b/old_src/Splines/bnl_splines.xml
similarity index 100%
rename from src/Splines/bnl_splines.xml
rename to old_src/Splines/bnl_splines.xml
diff --git a/src/Splines/make1dsplinereport.py b/old_src/Splines/make1dsplinereport.py
similarity index 100%
rename from src/Splines/make1dsplinereport.py
rename to old_src/Splines/make1dsplinereport.py
diff --git a/src/Statistical/CMakeLists.txt b/old_src/Statistical/CMakeLists.txt
similarity index 100%
rename from src/Statistical/CMakeLists.txt
rename to old_src/Statistical/CMakeLists.txt
diff --git a/src/Statistical/StatUtils.cxx b/old_src/Statistical/StatUtils.cxx
similarity index 100%
rename from src/Statistical/StatUtils.cxx
rename to old_src/Statistical/StatUtils.cxx
diff --git a/src/Statistical/StatUtils.h b/old_src/Statistical/StatUtils.h
similarity index 100%
rename from src/Statistical/StatUtils.h
rename to old_src/Statistical/StatUtils.h
diff --git a/src/T2K/CMakeLists.txt b/old_src/T2K/CMakeLists.txt
similarity index 100%
rename from src/T2K/CMakeLists.txt
rename to old_src/T2K/CMakeLists.txt
diff --git a/src/T2K/SAMPLEREADME b/old_src/T2K/SAMPLEREADME
similarity index 100%
rename from src/T2K/SAMPLEREADME
rename to old_src/T2K/SAMPLEREADME
diff --git a/src/T2K/SubMakefile.backup b/old_src/T2K/SubMakefile.backup
similarity index 100%
rename from src/T2K/SubMakefile.backup
rename to old_src/T2K/SubMakefile.backup
diff --git a/src/T2K/T2K_CC0pi_XSec_2DPcos_nu.cxx b/old_src/T2K/T2K_CC0pi_XSec_2DPcos_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC0pi_XSec_2DPcos_nu.cxx
rename to old_src/T2K/T2K_CC0pi_XSec_2DPcos_nu.cxx
diff --git a/src/T2K/T2K_CC0pi_XSec_2DPcos_nu.h b/old_src/T2K/T2K_CC0pi_XSec_2DPcos_nu.h
similarity index 100%
rename from src/T2K/T2K_CC0pi_XSec_2DPcos_nu.h
rename to old_src/T2K/T2K_CC0pi_XSec_2DPcos_nu.h
diff --git a/src/T2K/T2K_CC0pi_XSec_2DPcos_nu_nonuniform.cxx b/old_src/T2K/T2K_CC0pi_XSec_2DPcos_nu_nonuniform.cxx
similarity index 100%
rename from src/T2K/T2K_CC0pi_XSec_2DPcos_nu_nonuniform.cxx
rename to old_src/T2K/T2K_CC0pi_XSec_2DPcos_nu_nonuniform.cxx
diff --git a/src/T2K/T2K_CC0pi_XSec_2DPcos_nu_nonuniform.h b/old_src/T2K/T2K_CC0pi_XSec_2DPcos_nu_nonuniform.h
similarity index 100%
rename from src/T2K/T2K_CC0pi_XSec_2DPcos_nu_nonuniform.h
rename to old_src/T2K/T2K_CC0pi_XSec_2DPcos_nu_nonuniform.h
diff --git a/src/T2K/T2K_CC0pinp_STV_XSec_1Ddpt_nu.cxx b/old_src/T2K/T2K_CC0pinp_STV_XSec_1Ddpt_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC0pinp_STV_XSec_1Ddpt_nu.cxx
rename to old_src/T2K/T2K_CC0pinp_STV_XSec_1Ddpt_nu.cxx
diff --git a/src/T2K/T2K_CC0pinp_STV_XSec_1Ddpt_nu.h b/old_src/T2K/T2K_CC0pinp_STV_XSec_1Ddpt_nu.h
similarity index 100%
rename from src/T2K/T2K_CC0pinp_STV_XSec_1Ddpt_nu.h
rename to old_src/T2K/T2K_CC0pinp_STV_XSec_1Ddpt_nu.h
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1DQ2_nu.cxx b/old_src/T2K/T2K_CC1pip_CH_XSec_1DQ2_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1DQ2_nu.cxx
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1DQ2_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1DQ2_nu.h b/old_src/T2K/T2K_CC1pip_CH_XSec_1DQ2_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1DQ2_nu.h
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1DQ2_nu.h
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1DWrec_nu.cxx b/old_src/T2K/T2K_CC1pip_CH_XSec_1DWrec_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1DWrec_nu.cxx
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1DWrec_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1DWrec_nu.h b/old_src/T2K/T2K_CC1pip_CH_XSec_1DWrec_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1DWrec_nu.h
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1DWrec_nu.h
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dpmu_nu.cxx b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dpmu_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dpmu_nu.cxx
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dpmu_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dpmu_nu.h b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dpmu_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dpmu_nu.h
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dpmu_nu.h
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dppi_nu.cxx b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dppi_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dppi_nu.cxx
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dppi_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dppi_nu.h b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dppi_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dppi_nu.h
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dppi_nu.h
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dq3_nu.cxx b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dq3_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dq3_nu.cxx
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dq3_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dq3_nu.h b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dq3_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dq3_nu.h
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dq3_nu.h
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dthmupi_nu.cxx b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dthmupi_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dthmupi_nu.cxx
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dthmupi_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dthmupi_nu.h b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dthmupi_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dthmupi_nu.h
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dthmupi_nu.h
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dthpi_nu.cxx b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dthpi_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dthpi_nu.cxx
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dthpi_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dthpi_nu.h b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dthpi_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dthpi_nu.h
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dthpi_nu.h
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dthq3pi_nu.cxx b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dthq3pi_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dthq3pi_nu.cxx
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dthq3pi_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_CH_XSec_1Dthq3pi_nu.h b/old_src/T2K/T2K_CC1pip_CH_XSec_1Dthq3pi_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_CH_XSec_1Dthq3pi_nu.h
rename to old_src/T2K/T2K_CC1pip_CH_XSec_1Dthq3pi_nu.h
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.cxx b/old_src/T2K/T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.cxx
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.h b/old_src/T2K/T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.h
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.h
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1DEnuMB_nu.cxx b/old_src/T2K/T2K_CC1pip_H2O_XSec_1DEnuMB_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1DEnuMB_nu.cxx
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1DEnuMB_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1DEnuMB_nu.h b/old_src/T2K/T2K_CC1pip_H2O_XSec_1DEnuMB_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1DEnuMB_nu.h
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1DEnuMB_nu.h
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmu_nu.cxx b/old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmu_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmu_nu.cxx
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmu_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmu_nu.h b/old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmu_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmu_nu.h
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmu_nu.h
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.cxx b/old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.cxx
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.h b/old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.h
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.h
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1Dcospi_nu.cxx b/old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcospi_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1Dcospi_nu.cxx
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcospi_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1Dcospi_nu.h b/old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcospi_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1Dcospi_nu.h
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1Dcospi_nu.h
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1Dpmu_nu.cxx b/old_src/T2K/T2K_CC1pip_H2O_XSec_1Dpmu_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1Dpmu_nu.cxx
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1Dpmu_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1Dpmu_nu.h b/old_src/T2K/T2K_CC1pip_H2O_XSec_1Dpmu_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1Dpmu_nu.h
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1Dpmu_nu.h
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1Dppi_nu.cxx b/old_src/T2K/T2K_CC1pip_H2O_XSec_1Dppi_nu.cxx
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1Dppi_nu.cxx
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1Dppi_nu.cxx
diff --git a/src/T2K/T2K_CC1pip_H2O_XSec_1Dppi_nu.h b/old_src/T2K/T2K_CC1pip_H2O_XSec_1Dppi_nu.h
similarity index 100%
rename from src/T2K/T2K_CC1pip_H2O_XSec_1Dppi_nu.h
rename to old_src/T2K/T2K_CC1pip_H2O_XSec_1Dppi_nu.h
diff --git a/src/T2K/T2K_SignalDef.cxx b/old_src/T2K/T2K_SignalDef.cxx
similarity index 100%
rename from src/T2K/T2K_SignalDef.cxx
rename to old_src/T2K/T2K_SignalDef.cxx
diff --git a/src/T2K/T2K_SignalDef.h b/old_src/T2K/T2K_SignalDef.h
similarity index 100%
rename from src/T2K/T2K_SignalDef.h
rename to old_src/T2K/T2K_SignalDef.h
diff --git a/src/Tests/CMakeLists.txt b/old_src/Tests/CMakeLists.txt
similarity index 100%
rename from src/Tests/CMakeLists.txt
rename to old_src/Tests/CMakeLists.txt
diff --git a/src/Tests/ConstructibleFitEvent.h b/old_src/Tests/ConstructibleFitEvent.h
similarity index 100%
rename from src/Tests/ConstructibleFitEvent.h
rename to old_src/Tests/ConstructibleFitEvent.h
diff --git a/src/Tests/ConstructibleInputHandler.h b/old_src/Tests/ConstructibleInputHandler.h
similarity index 100%
rename from src/Tests/ConstructibleInputHandler.h
rename to old_src/Tests/ConstructibleInputHandler.h
diff --git a/src/Tests/DummyMinimizer.h b/old_src/Tests/DummyMinimizer.h
similarity index 100%
rename from src/Tests/DummyMinimizer.h
rename to old_src/Tests/DummyMinimizer.h
diff --git a/src/Tests/DummySample.cxx b/old_src/Tests/DummySample.cxx
similarity index 100%
rename from src/Tests/DummySample.cxx
rename to old_src/Tests/DummySample.cxx
diff --git a/src/Tests/FitMechanicsTest.cxx b/old_src/Tests/FitMechanicsTest.cxx
similarity index 100%
rename from src/Tests/FitMechanicsTest.cxx
rename to old_src/Tests/FitMechanicsTest.cxx
diff --git a/src/Tests/ParserTests.cxx b/old_src/Tests/ParserTests.cxx
similarity index 100%
rename from src/Tests/ParserTests.cxx
rename to old_src/Tests/ParserTests.cxx
diff --git a/src/Tests/SignalDefTests.cxx b/old_src/Tests/SignalDefTests.cxx
similarity index 100%
rename from src/Tests/SignalDefTests.cxx
rename to old_src/Tests/SignalDefTests.cxx
diff --git a/src/Tests/SmearceptanceTests.cxx b/old_src/Tests/SmearceptanceTests.cxx
similarity index 100%
rename from src/Tests/SmearceptanceTests.cxx
rename to old_src/Tests/SmearceptanceTests.cxx
diff --git a/src/Tests/test_shell_funcs.sh b/old_src/Tests/test_shell_funcs.sh
similarity index 100%
rename from src/Tests/test_shell_funcs.sh
rename to old_src/Tests/test_shell_funcs.sh
diff --git a/src/Utils/BeamUtils.cxx b/old_src/Utils/BeamUtils.cxx
similarity index 100%
rename from src/Utils/BeamUtils.cxx
rename to old_src/Utils/BeamUtils.cxx
diff --git a/src/Utils/BeamUtils.h b/old_src/Utils/BeamUtils.h
similarity index 100%
rename from src/Utils/BeamUtils.h
rename to old_src/Utils/BeamUtils.h
diff --git a/src/Utils/CMakeLists.txt b/old_src/Utils/CMakeLists.txt
similarity index 100%
rename from src/Utils/CMakeLists.txt
rename to old_src/Utils/CMakeLists.txt
diff --git a/src/Utils/FitUtils.cxx b/old_src/Utils/FitUtils.cxx
similarity index 100%
rename from src/Utils/FitUtils.cxx
rename to old_src/Utils/FitUtils.cxx
diff --git a/src/Utils/FitUtils.h b/old_src/Utils/FitUtils.h
similarity index 100%
rename from src/Utils/FitUtils.h
rename to old_src/Utils/FitUtils.h
diff --git a/src/Utils/GeneralUtils.cxx b/old_src/Utils/GeneralUtils.cxx
similarity index 100%
rename from src/Utils/GeneralUtils.cxx
rename to old_src/Utils/GeneralUtils.cxx
diff --git a/src/Utils/GeneralUtils.h b/old_src/Utils/GeneralUtils.h
similarity index 100%
rename from src/Utils/GeneralUtils.h
rename to old_src/Utils/GeneralUtils.h
diff --git a/src/Utils/OpenMPWrapper.h b/old_src/Utils/OpenMPWrapper.h
similarity index 100%
rename from src/Utils/OpenMPWrapper.h
rename to old_src/Utils/OpenMPWrapper.h
diff --git a/src/Utils/ParserUtils.cxx b/old_src/Utils/ParserUtils.cxx
similarity index 100%
rename from src/Utils/ParserUtils.cxx
rename to old_src/Utils/ParserUtils.cxx
diff --git a/src/Utils/ParserUtils.h b/old_src/Utils/ParserUtils.h
similarity index 100%
rename from src/Utils/ParserUtils.h
rename to old_src/Utils/ParserUtils.h
diff --git a/src/Utils/PhysConst.h b/old_src/Utils/PhysConst.h
similarity index 100%
rename from src/Utils/PhysConst.h
rename to old_src/Utils/PhysConst.h
diff --git a/src/Utils/PlotUtils.cxx b/old_src/Utils/PlotUtils.cxx
similarity index 100%
rename from src/Utils/PlotUtils.cxx
rename to old_src/Utils/PlotUtils.cxx
diff --git a/src/Utils/PlotUtils.h b/old_src/Utils/PlotUtils.h
similarity index 100%
rename from src/Utils/PlotUtils.h
rename to old_src/Utils/PlotUtils.h
diff --git a/src/Utils/README b/old_src/Utils/README
similarity index 100%
rename from src/Utils/README
rename to old_src/Utils/README
diff --git a/src/Utils/SAMPLEREADME b/old_src/Utils/SAMPLEREADME
similarity index 100%
rename from src/Utils/SAMPLEREADME
rename to old_src/Utils/SAMPLEREADME
diff --git a/src/Utils/SignalDef.cxx b/old_src/Utils/SignalDef.cxx
similarity index 100%
rename from src/Utils/SignalDef.cxx
rename to old_src/Utils/SignalDef.cxx
diff --git a/src/Utils/SignalDef.h b/old_src/Utils/SignalDef.h
similarity index 100%
rename from src/Utils/SignalDef.h
rename to old_src/Utils/SignalDef.h
diff --git a/src/Utils/TargetUtils.cxx b/old_src/Utils/TargetUtils.cxx
similarity index 100%
rename from src/Utils/TargetUtils.cxx
rename to old_src/Utils/TargetUtils.cxx
diff --git a/src/Utils/TargetUtils.h b/old_src/Utils/TargetUtils.h
similarity index 100%
rename from src/Utils/TargetUtils.h
rename to old_src/Utils/TargetUtils.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..26db198
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory(config)
+add_subdirectory(core)
+add_subdirectory(plugins)
+add_subdirectory(utility)
+add_subdirectory(generator)
+
+add_subdirectory(app)
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
new file mode 100644
index 0000000..4cb7ad3
--- /dev/null
+++ b/src/app/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_executable(DumpEventInfo DumpEventInfo.cxx)
+target_link_libraries(DumpEventInfo nuis_core nuis_config)
+target_link_libraries(DumpEventInfo ${CMAKE_DEPENDLIB_FLAGS})
+
+if(NOT "${CMAKE_LINK_FLAGS}" STREQUAL "")
+  set_target_properties(DumpEventInfo PROPERTIES LINK_FLAGS ${CMAKE_LINK_FLAGS})
+endif()
+
+install(TARGETS DumpEventInfo DESTINATION bin)
diff --git a/src/app/DumpEventInfo.cxx b/src/app/DumpEventInfo.cxx
new file mode 100644
index 0000000..3455253
--- /dev/null
+++ b/src/app/DumpEventInfo.cxx
@@ -0,0 +1,27 @@
+
+#include "config/GlobalConfiguration.hxx"
+
+#include "core/IInputHandler.hxx"
+#include "core/MinimalEvent.hxx"
+
+#include "plugins/Instantiate.hxx"
+
+#include "fhiclcpp/make_ParameterSet.h"
+
+#include <string>
+
+int main() {
+  nuis::config::EnsureConfigurationRead("./nuis.global.config.fcl");
+
+  fhicl::ParameterSet ps = fhicl::make_ParameterSet("./test.fcl");
+
+  nuis::plugins::plugin_traits<IInputHandler>::unique_ptr_t IH =
+      nuis::plugins::Instantiate<IInputHandler>(
+          ps.get<std::string>("sample.InputHandler"));
+
+  IH->Initialize(ps.get<fhicl::ParameterSet>("sample"));
+
+  for(IInputHandler::ev_index_t ev_it = 0; ev_it < IH->GetNEvents(); ++ev_it){
+    nuis::core::MinimalEvent const &ev = IH->GetMinimalEvent(ev_it);
+  }
+}
diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
new file mode 100644
index 0000000..a75def0
--- /dev/null
+++ b/src/config/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(config_implementation_files
+GlobalConfiguration.cxx)
+
+set(config_header_files
+GlobalConfiguration.hxx)
+
+add_library(nuis_config SHARED ${config_implementation_files})
+add_dependencies(nuis_config fhiclcpp-simple)
+
+install(TARGETS nuis_config DESTINATION lib)
+install(FILES ${config_header_files} DESTINATION include/config)
diff --git a/src/config/GlobalConfiguration.cxx b/src/config/GlobalConfiguration.cxx
new file mode 100644
index 0000000..c178fcd
--- /dev/null
+++ b/src/config/GlobalConfiguration.cxx
@@ -0,0 +1,40 @@
+#include "config/GlobalConfiguration.hxx"
+
+#include "fhiclcpp/ParameterSet.h"
+#include "fhiclcpp/make_ParameterSet.h"
+
+namespace nuis {
+namespace config {
+struct NamedDoc {
+  std::string name;
+  fhicl::ParameterSet document;
+  std::vector<std::string> files_read;
+};
+
+std::vector<NamedDoc> Configurations;
+
+NamedDoc &GetDocument_modifyable(std::string const &name) {
+  for (NamedDoc &doc : Configurations) {
+    if (doc.name == name) {
+      return doc;
+    }
+  }
+  Configurations.push_back(NamedDoc{name, fhicl::ParameterSet()});
+  return GetDocument_modifyable(name);
+}
+fhicl::ParameterSet const &GetDocument(std::string const &name) {
+  return GetDocument_modifyable(name).document;
+}
+bool EnsureConfigurationRead(std::string const &fhicl_file,
+                             std::string const &name) {
+  NamedDoc &doc = GetDocument_modifyable(name);
+
+  if (std::count(doc.files_read.begin(), doc.files_read.end(), fhicl_file)) {
+    return false;
+  }
+
+  doc.document.splice(fhicl::make_ParameterSet(fhicl_file));
+  return true;
+}
+} // namespace config
+} // namespace nuis
diff --git a/src/config/GlobalConfiguration.hxx b/src/config/GlobalConfiguration.hxx
new file mode 100644
index 0000000..c5a75dd
--- /dev/null
+++ b/src/config/GlobalConfiguration.hxx
@@ -0,0 +1,37 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef CONFIG_GLOBALCONFIGURATION_HXX_SEEN
+#define CONFIG_GLOBALCONFIGURATION_HXX_SEEN
+
+#include <string>
+
+namespace fhicl {
+class ParameterSet;
+}
+
+namespace nuis {
+namespace config {
+fhicl::ParameterSet const &GetDocument(std::string const &name = "global");
+bool EnsureConfigurationRead(std::string const &fhicl_file,
+                             std::string const &name = "global");
+} // namespace config
+} // namespace nuis
+
+#endif
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
new file mode 100644
index 0000000..ad886b2
--- /dev/null
+++ b/src/core/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(core_implementation_files
+FullEvent.cxx
+# InputManager.cxx
+MinimalEvent.cxx
+Particle.cxx)
+
+set(core_header_files
+FullEvent.hxx
+# InputManager.hxx
+MinimalEvent.hxx
+Particle.hxx
+IInputHandler.hxx
+types.hxx)
+
+add_library(nuis_core SHARED ${core_implementation_files})
+target_link_libraries(nuis_core)
+
+install(TARGETS nuis_core DESTINATION lib)
+install(FILES ${core_header_files} DESTINATION include/core)
diff --git a/src/core/FullEvent.cxx b/src/core/FullEvent.cxx
new file mode 100644
index 0000000..83ebcf4
--- /dev/null
+++ b/src/core/FullEvent.cxx
@@ -0,0 +1,13 @@
+#include "core/FullEvent.hxx"
+
+namespace nuis {
+namespace core {
+FullEvent::FullEvent() : MinimalEvent() {
+  ParticleStack.resize(static_cast<size_t>(Particle::Status_t::kNParticleStatus));
+}
+FullEvent::FullEvent(FullEvent &&other)
+    : MinimalEvent(std::move(other)),
+      ParticleStack(std::move(other.ParticleStack)) {}
+
+} // namespace core
+} // namespace nuis
diff --git a/src/core/FullEvent.hxx b/src/core/FullEvent.hxx
new file mode 100644
index 0000000..5835c10
--- /dev/null
+++ b/src/core/FullEvent.hxx
@@ -0,0 +1,46 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef CORE_FULLEVENT_HXX_SEEN
+#define CORE_FULLEVENT_HXX_SEEN
+
+#include "core/MinimalEvent.hxx"
+#include "core/Particle.hxx"
+
+
+namespace nuis {
+namespace core {
+
+///\brief The full, internal event format.
+class FullEvent : public MinimalEvent {
+public:
+  struct StatusParticles {
+    Particle::Status_t status;
+    std::vector<Particle> particles;
+  };
+
+  FullEvent();
+  FullEvent(FullEvent const&) = delete;
+  FullEvent(FullEvent&&);
+  std::vector<StatusParticles> ParticleStack;
+};
+
+} // namespace core
+} // namespace nuis
+#endif
diff --git a/src/core/IInputHandler.hxx b/src/core/IInputHandler.hxx
new file mode 100644
index 0000000..f6ee96a
--- /dev/null
+++ b/src/core/IInputHandler.hxx
@@ -0,0 +1,57 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef CORE_IINPUTHANDLER_HXX_SEEN
+#define CORE_IINPUTHANDLER_HXX_SEEN
+
+#include "plugins/traits.hxx"
+
+#include "exception/exception.hxx"
+
+namespace fhicl {
+class ParameterSet;
+}
+
+namespace nuis {
+namespace core {
+class MinimalEvent;
+class FullEvent;
+} // namespace core
+} // namespace nuis
+
+class IInputHandler {
+public:
+
+  NEW_NUIS_EXCEPT(invalid_input_file);
+  NEW_NUIS_EXCEPT(invalid_entry);
+
+  typedef size_t ev_index_t;
+
+  virtual void Initialize(fhicl::ParameterSet const &) = 0;
+  virtual nuis::core::MinimalEvent const &GetMinimalEvent(ev_index_t idx) = 0;
+  virtual nuis::core::FullEvent const &GetFullEvent(ev_index_t idx) = 0;
+
+  virtual size_t GetNEvents() = 0;
+
+  virtual ~IInputHandler(){}
+};
+
+DECLARE_PLUGIN_INTERFACE(IInputHandler);
+
+#endif
diff --git a/src/core/InputManager.cxx b/src/core/InputManager.cxx
new file mode 100644
index 0000000..938211f
--- /dev/null
+++ b/src/core/InputManager.cxx
@@ -0,0 +1,22 @@
+#include "core/InputManager.hxx"
+
+namespace nuis {
+namespace core {
+
+InputManager::Input_id_t
+InputManager::EnsureInputLoaded(std::string const &file_name) {
+  for (size_t i = 0; i < Inputs.size(); ++i) {
+    if (Inputs[i].name == file_name) {
+      return i;
+    }
+  }
+
+  Inputs.push_back(NamedInputHandler{
+      file_name,
+  });
+}
+InputManager::Input_id_t
+InputManager::GetInputId(std::string const &file_name) {}
+IInputHandler &InputManager::GetInputHandler(InputManager::Input_id_t id) {}
+} // namespace core
+} // namespace nuis
diff --git a/src/core/InputManager.hxx b/src/core/InputManager.hxx
new file mode 100644
index 0000000..f965335
--- /dev/null
+++ b/src/core/InputManager.hxx
@@ -0,0 +1,52 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef CORE_INPUTMANAGER_HXX_SEEN
+#define CORE_INPUTMANAGER_HXX_SEEN
+
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace nuis {
+namespace core {
+class IInputHandler;
+}
+} // namespace nuis
+
+namespace nuis {
+namespace core {
+class InputManager {
+  struct NamedInputHandler {
+    std::string name;
+    std::unique_ptr<IInputHandler> handler;
+  };
+  std::vector<NamedInputHandler> Inputs;
+
+public:
+  typedef size_t Input_id_t;
+
+  Input_id_t EnsureInputLoaded(std::string const &file_name);
+  Input_id_t GetInputId(std::string const &file_name);
+  IInputHandler &GetInputHandler(Input_id_t id);
+};
+} // namespace core
+} // namespace nuis
+
+#endif
diff --git a/src/core/MinimalEvent.cxx b/src/core/MinimalEvent.cxx
new file mode 100644
index 0000000..1ab1fd9
--- /dev/null
+++ b/src/core/MinimalEvent.cxx
@@ -0,0 +1,21 @@
+#include "core/MinimalEvent.hxx"
+
+namespace nuis {
+namespace core {
+MinimalEvent::MinimalEvent()
+    : mode(0), probe_E(0), probe_pdg(0), XSecWeight(1), RWWeight(1) {
+#ifdef __NUWRO_ENABLED__
+  fNuWroEvent = nullptr;
+#endif
+}
+
+MinimalEvent::MinimalEvent(MinimalEvent &&other)
+    : mode(other.mode), probe_E(other.probe_E), probe_pdg(other.probe_pdg),
+      XSecWeight(other.XSecWeight), RWWeight(other.RWWeight) {
+#ifdef __NUWRO_ENABLED__
+  fNuWroEvent = other.fNuWroEvent;
+  other.fNuWroEvent = nullptr;
+#endif
+}
+} // namespace core
+} // namespace nuis
diff --git a/src/core/MinimalEvent.hxx b/src/core/MinimalEvent.hxx
new file mode 100644
index 0000000..4c83e11
--- /dev/null
+++ b/src/core/MinimalEvent.hxx
@@ -0,0 +1,64 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef CORE_MINIMALEVENT_HXX_SEEN
+#define CORE_MINIMALEVENT_HXX_SEEN
+
+#ifdef __NUWRO_ENABLED__
+#include "event1.h"
+#endif
+
+#include "core/types.hxx"
+
+namespace nuis {
+namespace core {
+///\brief The minimal event information needed to perform reweights.
+///
+/// Most often, event selections cannot be applied using this reduced format.
+class MinimalEvent {
+public:
+  MinimalEvent();
+  MinimalEvent(MinimalEvent const &) = delete;
+  MinimalEvent(MinimalEvent &&);
+  /// True interaction mode
+  Channel_t mode;
+  /// True probe energy
+  double probe_E;
+  /// True probe particle code
+  PDG_t probe_pdg;
+
+  /// Event-weight that can be used to scale to a cross-section prediction
+  double XSecWeight;
+  /// Event weight incurred from current reweight engine state.
+  double RWWeight;
+
+#ifdef __NUWRO_ENABLED__
+  ///\brief Pointer to Nuwro event
+  ///
+  /// This will usually be tied to a TTree and so we are not responsible for
+  /// deleting it
+  event *fNuWroEvent;
+#endif
+
+  // Use this to check if
+  bool operator!() { return mode == 0; }
+};
+} // namespace core
+} // namespace nuis
+#endif
diff --git a/src/core/Particle.cxx b/src/core/Particle.cxx
new file mode 100644
index 0000000..b3a856e
--- /dev/null
+++ b/src/core/Particle.cxx
@@ -0,0 +1,11 @@
+#include "core/Particle.hxx"
+
+#include "TLorentzVector.h"
+
+namespace nuis {
+namespace core {
+Particle::Particle() : pdg(0), status(Status_t::kUnknown), P4(0, 0, 0, 0) {}
+Particle::Particle(Particle const &other)
+    : pdg(other.pdg), status(other.status), P4(other.P4) {}
+} // namespace core
+} // namespace nuis
diff --git a/src/core/Particle.hxx b/src/core/Particle.hxx
new file mode 100644
index 0000000..0bb047e
--- /dev/null
+++ b/src/core/Particle.hxx
@@ -0,0 +1,48 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef CORE_PARTICLE_HXX_SEEN
+#define CORE_PARTICLE_HXX_SEEN
+
+#include "core/types.hxx"
+
+#include "TLorentzVector.h"
+
+namespace nuis {
+namespace core {
+class Particle {
+public:
+  enum class Status_t {
+    kNuclearLeaving = 0,
+    kPrimaryInitialState,
+    kPrimaryFinalState,
+    kIntermediate,
+    kUnknown,
+    kNParticleStatus
+  };
+  Particle();
+  Particle(Particle const &);
+
+  PDG_t pdg;
+  Status_t status;
+  TLorentzVector P4;
+};
+} // namespace core
+} // namespace nuis
+#endif
diff --git a/src/core/types.hxx b/src/core/types.hxx
new file mode 100644
index 0000000..b4b2cb6
--- /dev/null
+++ b/src/core/types.hxx
@@ -0,0 +1,28 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+#ifndef CORE_TYPES_HXX_SEEN
+#define CORE_TYPES_HXX_SEEN
+
+namespace nuis {
+namespace core {
+typedef long Channel_t;
+typedef long PDG_t;
+} // namespace core
+} // namespace nuis
+#endif
diff --git a/src/exception/CMakeLists.txt b/src/exception/CMakeLists.txt
new file mode 100644
index 0000000..9c6f035
--- /dev/null
+++ b/src/exception/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(exception_header_files
+exception.hxx)
+
+install(FILES ${exception_header_files} DESTINATION include/exception)
diff --git a/src/exception/exception.hxx b/src/exception/exception.hxx
new file mode 100644
index 0000000..294ee46
--- /dev/null
+++ b/src/exception/exception.hxx
@@ -0,0 +1,40 @@
+#ifndef EXCEPTION_EXCEPTION_SEEN
+#define EXCEPTION_EXCEPTION_SEEN
+
+#include <sstream>
+#include <stdexcept>
+#include <string>
+
+namespace nuis {
+struct nuis_except : public std::exception {
+  std::stringstream msgstrm;
+  std::string msg;
+  nuis_except() : msgstrm(), msg() {}
+  nuis_except(nuis_except const &other)
+      : msgstrm(), msg() {
+    msgstrm << other.msg;
+    msg = other.msg;
+  }
+  const char *what() const noexcept { return msg.c_str(); }
+
+  template <typename T> nuis_except &operator<<(T const &obj) {
+    msgstrm << obj;
+    msg = msgstrm.str();
+    return (*this);
+  }
+};
+
+} // namespace nuis
+
+#define NEW_NUIS_EXCEPT(EXCEPT_NAME)                                           \
+  struct EXCEPT_NAME : public nuis::nuis_except {                              \
+    EXCEPT_NAME() : nuis::nuis_except() {}                                     \
+    EXCEPT_NAME(EXCEPT_NAME const &other) : nuis::nuis_except(other) {}        \
+    template <typename T> EXCEPT_NAME &operator<<(T const &obj) {              \
+      msgstrm << obj;                                                          \
+      msg = msgstrm.str();                                                     \
+      return (*this);                                                          \
+    }                                                                          \
+  }
+
+#endif
diff --git a/src/generator/CMakeLists.txt b/src/generator/CMakeLists.txt
new file mode 100644
index 0000000..85c0136
--- /dev/null
+++ b/src/generator/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+if(USE_NuWro)
+  add_library(InputHandlers SHARED NuWroInputHandler.cxx)
+  target_link_libraries(InputHandlers nuis_core nuis_config)
+
+  install(TARGETS InputHandlers DESTINATION plugins)
+endif(USE_NuWro)
diff --git a/src/generator/NuWroInputHandler.cxx b/src/generator/NuWroInputHandler.cxx
new file mode 100644
index 0000000..10b1380
--- /dev/null
+++ b/src/generator/NuWroInputHandler.cxx
@@ -0,0 +1,42 @@
+#include "NuWroInputHandler.hxx"
+
+#include "core/FullEvent.hxx"
+
+#include "utility/ROOTUtility.hxx"
+
+#include "fhiclcpp/ParameterSet.h"
+
+using namespace nuis::core;
+using namespace nuis::utility;
+
+NuWroInputHandler::NuWroInputHandler() : fInputTree(nullptr) {}
+NuWroInputHandler::NuWroInputHandler(NuWroInputHandler &&other)
+    : fInputTree(std::move(other.fInputTree)),
+      fReaderEvent(std::move(other.fReaderEvent)) {}
+
+void NuWroInputHandler::Initialize(fhicl::ParameterSet const &ps) {
+
+  fInputTree = CheckGetTTree(ps.get<std::string>("file"), "treeout");
+
+  fReaderEvent.fNuWroEvent = nullptr;
+  fInputTree->tree->SetBranchAddress("e", &fReaderEvent.fNuWroEvent);
+}
+MinimalEvent const &NuWroInputHandler::GetMinimalEvent(ev_index_t idx) {
+  if (idx >= GetNEvents()) {
+    throw IInputHandler::invalid_entry()
+        << "[ERROR]: Attempted to get entry " << idx
+        << " from an InputHandler with only " << GetNEvents();
+  }
+  fInputTree->tree->GetEntry(idx);
+  return fReaderEvent;
+}
+
+FullEvent const &NuWroInputHandler::GetFullEvent(ev_index_t idx) {
+  (void)GetMinimalEvent(idx);
+  //Fill particle stack
+  return fReaderEvent;
+}
+
+size_t NuWroInputHandler::GetNEvents() { return fInputTree->tree->GetEntries(); }
+
+DECLARE_PLUGIN(IInputHandler,NuWroInputHandler);
diff --git a/src/generator/NuWroInputHandler.hxx b/src/generator/NuWroInputHandler.hxx
new file mode 100644
index 0000000..184cb96
--- /dev/null
+++ b/src/generator/NuWroInputHandler.hxx
@@ -0,0 +1,56 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef GENERATOR_NUWROINPUTHANDLER_HXX_SEEN
+#define GENERATOR_NUWROINPUTHANDLER_HXX_SEEN
+
+#include "core/IInputHandler.hxx"
+#include "core/FullEvent.hxx"
+
+#include <memory>
+
+namespace fhicl {
+class ParameterSet;
+}
+
+namespace nuis {
+namespace core {
+class MinimalEvent;
+} // namespace core
+namespace utility {
+class TreeFile;
+}
+} // namespace nuis
+
+class NuWroInputHandler : public IInputHandler {
+  std::unique_ptr<nuis::utility::TreeFile> fInputTree;
+  nuis::core::FullEvent fReaderEvent;
+
+public:
+  NuWroInputHandler();
+  NuWroInputHandler(NuWroInputHandler const &) = delete;
+  NuWroInputHandler(NuWroInputHandler &&);
+
+  void Initialize(fhicl::ParameterSet const &);
+  nuis::core::MinimalEvent const &GetMinimalEvent(ev_index_t idx);
+  nuis::core::FullEvent const &GetFullEvent(ev_index_t idx);
+  size_t GetNEvents();
+};
+
+#endif
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
new file mode 100644
index 0000000..5c98f59
--- /dev/null
+++ b/src/plugins/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(plugins_header_files
+Instantiate.hxx
+traits.hxx)
+
+install(FILES ${plugins_header_files} DESTINATION include/plugins)
diff --git a/src/plugins/Instantiate.hxx b/src/plugins/Instantiate.hxx
new file mode 100644
index 0000000..ab60a2b
--- /dev/null
+++ b/src/plugins/Instantiate.hxx
@@ -0,0 +1,242 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef PLUGINS_PLUGINMANAGER_HXX_SEEN
+#define PLUGINS_PLUGINMANAGER_HXX_SEEN
+
+#include "plugins/traits.hxx"
+
+#include "config/GlobalConfiguration.hxx"
+
+#include "utility/FileSystemUtility.hxx"
+
+#include "exception/exception.hxx"
+
+#include "fhiclcpp/ParameterSet.h"
+#include "string_parsers/to_string.hxx"
+
+// linux
+#include <dlfcn.h>
+
+#include <functional>
+#include <iomanip>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace nuis {
+namespace plugins {
+
+NEW_NUIS_EXCEPT(failed_to_find_instantiator);
+NEW_NUIS_EXCEPT(malformed_plugin_interface);
+NEW_NUIS_EXCEPT(failed_to_load_so);
+
+typedef void *(*inst_fcn)();
+typedef void (*dltr_fcn)(void *);
+
+template <typename T> struct PluginInstantiator {
+
+  std::string FQ_so_path;
+  std::string Base_classname;
+  std::string Classname;
+  void *dllib;
+  inst_fcn Instantiator;
+  dltr_fcn Deleter;
+
+  PluginInstantiator()
+      : FQ_so_path(""), Base_classname(""), Classname(""), dllib(nullptr),
+        Instantiator(nullptr), Deleter(nullptr) {}
+  PluginInstantiator(PluginInstantiator const &) = delete;
+  PluginInstantiator(PluginInstantiator &&other) {
+    FQ_so_path = std::move(other.FQ_so_path);
+    Base_classname = std::move(other.Base_classname);
+    Classname = std::move(other.Classname);
+    dllib = other.dllib;
+    Instantiator = other.Instantiator;
+    Deleter = other.Deleter;
+
+    other.FQ_so_path = "";
+    other.Base_classname = "";
+    other.Classname = "";
+    other.dllib = nullptr;
+    other.Instantiator = nullptr;
+    other.Deleter = nullptr;
+  }
+
+  typename plugin_traits<T>::unique_ptr_t Instantiate() {
+    std::cout << (void *)Deleter << std::endl;
+    T *inst = reinterpret_cast<T *>((*Instantiator)());
+    dltr_fcn dltr = Deleter;
+    std::string cln = Classname;
+    std::function<void(T *)> deleter = [=](T *inst) {
+      std::cout << "[INFO]: Deleting instance of " << cln << " with "
+                << (void *)dltr << std::endl;
+      (*dltr)(inst);
+    };
+    return typename plugin_traits<T>::unique_ptr_t(inst, deleter);
+  }
+};
+
+struct NamedSO {
+  std::string name;
+  void *dllib;
+
+  NamedSO() : name(""), dllib(nullptr) {}
+  NamedSO(NamedSO const &) = delete;
+  NamedSO(NamedSO &&other) : name(std::move(other.name)), dllib(other.dllib) {
+    other.dllib = nullptr;
+  }
+
+  ~NamedSO() {
+    if (dllib) {
+      std::cout << "[INFO]: dlclose on shared object: " << std::quoted(name)
+                << std::endl;
+      dlclose(dllib);
+    }
+  }
+};
+
+NamedSO &GetSharedObject(std::string const &FQPath) {
+  static std::vector<NamedSO> LoadedSharedObjects;
+
+  for (NamedSO &so : LoadedSharedObjects) {
+    if (so.name == FQPath) {
+      return so;
+    }
+  }
+
+  NamedSO so;
+  so.name = FQPath;
+  so.dllib = dlopen(FQPath.c_str(), RTLD_NOW | RTLD_GLOBAL);
+
+  char const *dlerr_cstr = dlerror();
+  std::string dlerr;
+  if (dlerr_cstr) {
+    dlerr = dlerr_cstr;
+  }
+
+  if (dlerr.length()) {
+    throw failed_to_load_so()
+        << "[INFO]: Failed to load shared object: " << FQPath
+        << " with dlerror: " << dlerr;
+  } else {
+    std::cout << "[INFO]: Loaded shared object " << FQPath << std::endl;
+  }
+
+  LoadedSharedObjects.push_back(std::move(so));
+  return LoadedSharedObjects.back();
+}
+
+template <typename T>
+typename plugin_traits<T>::unique_ptr_t
+Instantiate(std::string const &classname) {
+
+  static std::vector<PluginInstantiator<T>> LoadedPlugins;
+
+  std::vector<std::string> plugin_search_dirs = config::GetDocument().get<std::vector<std::string>>("plugin_search_path");
+
+  for (std::string path : plugin_search_dirs) {
+    path = utility::EnsureTrailingSlash(path);
+    for (std::string const &so_name :
+         utility::GetMatchingFiles(path, ".*\\.so")) {
+
+      for (PluginInstantiator<T> &plugin : LoadedPlugins) {
+        if (plugin.FQ_so_path == (path + so_name) &&
+            (plugin.Base_classname == plugin_traits<T>::interface_name()) &&
+            (plugin.Classname == classname)) {
+          std::cout << "[INFO]: Using already loaded PluginInstantiator"
+                    << std::endl;
+          return plugin.Instantiate();
+        }
+      }
+
+      PluginInstantiator<T> plugin;
+      plugin.FQ_so_path = path + so_name;
+      plugin.Base_classname = plugin_traits<T>::interface_name();
+      plugin.Classname = classname;
+      plugin.dllib = GetSharedObject(plugin.FQ_so_path).dllib;
+
+      char const *dlerr_cstr = nullptr;
+      std::string dlerr("");
+
+      plugin.Instantiator = reinterpret_cast<inst_fcn>(dlsym(
+          plugin.dllib,
+          plugin_traits<T>::instantiator_function_name(classname).c_str()));
+
+      dlerr_cstr = dlerror();
+      if (dlerr_cstr) {
+        dlerr = dlerr_cstr;
+      }
+
+      if (dlerr_cstr) {
+        std::cout << "[INFO]: Failed to load appropriate instantiator method: "
+                  << plugin_traits<T>::instantiator_function_name(classname)
+                  << " from shared object " << plugin.FQ_so_path;
+        continue;
+      } else {
+        std::cout << "[INFO]: Loaded instantiator method: "
+                  << plugin_traits<T>::instantiator_function_name(classname)
+                  << " from shared object " << plugin.FQ_so_path << std::endl;
+      }
+
+      plugin.Deleter = reinterpret_cast<dltr_fcn>(
+          dlsym(plugin.dllib,
+                plugin_traits<T>::deleter_function_name(classname).c_str()));
+
+      std::cout << (void *)plugin.Deleter << std::endl;
+
+      dlerr_cstr = dlerror();
+      if (dlerr_cstr) {
+        dlerr = dlerr_cstr;
+      }
+
+      if (dlerr_cstr) {
+        throw malformed_plugin_interface()
+            << "[ERROR]: Failed to load appropriate deleter method: "
+            << plugin_traits<T>::deleter_function_name(classname)
+            << " from shared object " << plugin.FQ_so_path
+            << " with error:  " << std::quoted(dlerr);
+      } else {
+        std::cout << "[INFO]: Loaded deleter method: "
+                  << plugin_traits<T>::deleter_function_name(classname)
+                  << " from shared object " << plugin.FQ_so_path << std::endl;
+      }
+
+      std::cout << "[INFO]: Checking if shared object "
+                << std::quoted(plugin.FQ_so_path)
+                << " knows how to instantiate class " << std::quoted(classname)
+                << " via interface "
+                << std::quoted(plugin_traits<T>::interface_name()) << std::endl;
+
+      LoadedPlugins.push_back(std::move(plugin));
+      return LoadedPlugins.back().Instantiate();
+    }
+  }
+  throw failed_to_find_instantiator()
+      << "[ERROR]: Failed to find instantiator for classname: "
+      << std::quoted(classname) << " using interface "
+      << std::quoted(plugin_traits<T>::interface_name())
+      << " from configured search paths: "
+      << fhicl::string_parsers::T2Str<std::vector<std::string>>(
+             plugin_search_dirs);
+}
+} // namespace plugins
+} // namespace nuis
+#endif
diff --git a/src/plugins/traits.hxx b/src/plugins/traits.hxx
new file mode 100644
index 0000000..09dd3d4
--- /dev/null
+++ b/src/plugins/traits.hxx
@@ -0,0 +1,76 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef PLUGINS_TRAITS_HXX_SEEN
+#define PLUGINS_TRAITS_HXX_SEEN
+
+#include <functional>
+#include <memory>
+#include <string>
+
+namespace nuis {
+namespace plugins {
+template <typename T> struct plugin_traits {};
+} // namespace plugins
+} // namespace nuis
+
+#define DECLARE_PLUGIN_INTERFACE(INTERFACE_CLASS_NAME)                         \
+  namespace nuis {                                                             \
+  namespace plugins {                                                          \
+  template <> struct plugin_traits<INTERFACE_CLASS_NAME> {                     \
+    typedef std::unique_ptr<INTERFACE_CLASS_NAME,                              \
+                            std::function<void(INTERFACE_CLASS_NAME *)>>       \
+        unique_ptr_t;                                                          \
+    static std::string interface_name() { return #INTERFACE_CLASS_NAME; }      \
+    static std::string                                                         \
+    instantiator_function_name(std::string const &classname) {                 \
+      return std::string("nuis_plugins_") +                                    \
+             plugin_traits<INTERFACE_CLASS_NAME>::interface_name() + "_" +     \
+             classname + "_instantiator";                                      \
+    }                                                                          \
+    static std::string                                                         \
+    check_manifest_function_name(std::string const &classname) {               \
+      return std::string("nuis_plugins_") +                                    \
+             plugin_traits<INTERFACE_CLASS_NAME>::interface_name() + "_" +     \
+             classname + "_check_manifest";                                    \
+    }                                                                          \
+    static std::string deleter_function_name(std::string const &classname) {   \
+      return std::string("nuis_plugins_") +                                    \
+             plugin_traits<INTERFACE_CLASS_NAME>::interface_name() + "_" +     \
+             classname + "_deleter";                                           \
+    }                                                                          \
+  };                                                                           \
+  }                                                                            \
+  }
+
+#define BUILDMETHODNAME(CN, PN, POST) nuis_plugins_##CN##_##PN##POST
+
+#define DECLARE_PLUGIN(INTERFACE_CLASS_NAME, PLUGIN_CLASS_NAME)                \
+  extern "C" {                                                                 \
+  void *BUILDMETHODNAME(INTERFACE_CLASS_NAME, PLUGIN_CLASS_NAME,               \
+                        _instantiator)() {                                     \
+    return new PLUGIN_CLASS_NAME();                                            \
+  }                                                                            \
+  void BUILDMETHODNAME(INTERFACE_CLASS_NAME, PLUGIN_CLASS_NAME,                \
+                       _deleter)(void *instance) {                             \
+    delete reinterpret_cast<PLUGIN_CLASS_NAME *>(instance);                    \
+  }                                                                            \
+  }
+
+#endif
diff --git a/src/tests/plugins/Dummies.cxx b/src/tests/plugins/Dummies.cxx
new file mode 100644
index 0000000..5e9a46e
--- /dev/null
+++ b/src/tests/plugins/Dummies.cxx
@@ -0,0 +1,35 @@
+#include "IDummy.hxx"
+
+#include "plugins/traits.hxx"
+
+#include <iomanip>
+#include <iostream>
+#include <memory>
+
+struct AddOne : public IDummy {
+  double val;
+  void Configure(double v) { val = v; }
+  void Shout() {
+    std::cout << "[Config]: AddOne to " << val << " = " << (val + 1)
+              << std::endl;
+  }
+};
+DECLARE_PLUGIN(IDummy, AddOne);
+
+struct Double : public IDummy {
+  double val;
+  void Configure(double v) { val = v; }
+  void Shout() {
+    std::cout << "[Shout]: Double " << val << " = " << (val * 2) << std::endl;
+  }
+};
+DECLARE_PLUGIN(IDummy, Double);
+
+struct Double2 : public IDummy2 {
+  std::string val;
+  void Configure2(std::string v) { val = v; }
+  void Shout2() {
+    std::cout << "[Shout2]: Double2 " << val << " = " << val << val << std::endl;
+  }
+};
+DECLARE_PLUGIN(IDummy2, Double2);
diff --git a/src/tests/plugins/Dummies.so b/src/tests/plugins/Dummies.so
new file mode 100755
index 0000000..410d4ef
Binary files /dev/null and b/src/tests/plugins/Dummies.so differ
diff --git a/src/tests/plugins/IDummy.hxx b/src/tests/plugins/IDummy.hxx
new file mode 100644
index 0000000..e99e349
--- /dev/null
+++ b/src/tests/plugins/IDummy.hxx
@@ -0,0 +1,22 @@
+#ifndef TESTS_PLUGINS_IDUMMY_HXX_SEEN
+#define TESTS_PLUGINS_IDUMMY_HXX_SEEN
+
+#include "plugins/traits.hxx"
+
+#include <iostream>
+
+struct IDummy {
+  virtual void Configure(double) = 0;
+  virtual void Shout() = 0;
+};
+
+DECLARE_PLUGIN_INTERFACE(IDummy);
+
+struct IDummy2 {
+  virtual void Configure2(std::string) = 0;
+  virtual void Shout2() = 0;
+};
+
+DECLARE_PLUGIN_INTERFACE(IDummy2);
+
+#endif
diff --git a/src/tests/plugins/TestDummy.cxx b/src/tests/plugins/TestDummy.cxx
new file mode 100644
index 0000000..b8d040c
--- /dev/null
+++ b/src/tests/plugins/TestDummy.cxx
@@ -0,0 +1,30 @@
+#include "plugins/PluginManager.hxx"
+
+#include "IDummy.hxx"
+
+#include <memory>
+
+int main() {
+  nuis::plugins::plugin_traits<IDummy>::unique_ptr_t addone =
+      nuis::plugins::Instantiate<IDummy>("AddOne");
+  addone->Configure(5);
+  addone->Shout();
+
+  nuis::plugins::plugin_traits<IDummy>::unique_ptr_t dbl =
+      nuis::plugins::Instantiate<IDummy>("Double");
+  dbl->Configure(5);
+  dbl->Shout();
+
+  try {
+    nuis::plugins::plugin_traits<IDummy>::unique_ptr_t fail =
+        nuis::plugins::Instantiate<IDummy>("Failure");
+  } catch (nuis::plugins::failed_to_find_instantiator &e) {
+    std::cout << "[SUCCESS]: Caught " << e.what() << std::endl;
+  }
+
+  nuis::plugins::plugin_traits<IDummy2>::unique_ptr_t dbl2 =
+      nuis::plugins::Instantiate<IDummy2>("Double2");
+  dbl2->Configure2("HelloPluginWorld!");
+  dbl2->Shout2();
+
+}
diff --git a/src/tests/plugins/TestDummy.exe b/src/tests/plugins/TestDummy.exe
new file mode 100755
index 0000000..cad2690
Binary files /dev/null and b/src/tests/plugins/TestDummy.exe differ
diff --git a/src/utility/CMakeLists.txt b/src/utility/CMakeLists.txt
new file mode 100644
index 0000000..bc7e978
--- /dev/null
+++ b/src/utility/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(utility_header_files
+FileSystemUtility.hxx
+FullEventUtility.hxx
+PDGCodeUtility.hxx)
+
+install(FILES ${utility_header_files} DESTINATION include/utility)
diff --git a/src/utility/FileSystemUtility.hxx b/src/utility/FileSystemUtility.hxx
new file mode 100644
index 0000000..92cfb79
--- /dev/null
+++ b/src/utility/FileSystemUtility.hxx
@@ -0,0 +1,67 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef UTILITY_FILESYSTEMUTILITY_HXX_SEEN
+#define UTILITY_FILESYSTEMUTILITY_HXX_SEEN
+
+#include "exception/exception.hxx"
+
+#include <dirent.h>
+
+#include <regex>
+#include <string>
+#include <vector>
+
+namespace nuis {
+namespace utility {
+
+NEW_NUIS_EXCEPT(unexpected_empty_string);
+
+inline std::string EnsureTrailingSlash(std::string str) {
+  if (!str.size()) {
+    throw unexpected_empty_string();
+  }
+  if (str.back() != '/') {
+    return str + '/';
+  }
+  return str;
+}
+
+inline std::vector<std::string> GetMatchingFiles(std::string directory,
+                                                 std::string const &pattern) {
+  directory = EnsureTrailingSlash(directory);
+  std::regex rpattern(pattern);
+
+  std::vector<std::string> matches;
+
+  DIR *dir;
+  struct dirent *ent;
+  dir = opendir(directory.c_str());
+  if (dir != NULL) {
+    while ((ent = readdir(dir)) != NULL) {
+      if (std::regex_match(ent->d_name, rpattern)) {
+        matches.push_back(ent->d_name);
+      }
+    }
+  }
+  return matches;
+}
+} // namespace utility
+} // namespace nuis
+#endif
diff --git a/src/utility/FullEventUtility.hxx b/src/utility/FullEventUtility.hxx
new file mode 100644
index 0000000..ede12fc
--- /dev/null
+++ b/src/utility/FullEventUtility.hxx
@@ -0,0 +1,149 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef UTILITY_FULLEVENTUTILITY_HXX_SEEN
+#define UTILITY_FULLEVENTUTILITY_HXX_SEEN
+
+namespace nuis {
+namespace utility {
+
+template <size_t N>
+std::vector<Particle>
+GetParticles(FullEvent const &ev, std::vector<PDG_t> const &pdgs,
+             Particle::Status_t status = Particle::Status_t::kNuclearLeaving,
+             bool include_matching_pdg = true) {
+  std::vector<Particle> selected_particles;
+  for (StatusParticles const &parts : ev.ParticleStack) {
+    if (parts.status != status) {
+      continue;
+    }
+    for (Particle const &part : parts.particles) {
+      bool matched_pdg = false;
+      for (pdg : pdgs) {
+        matched_pdg = matched_pdg || (part.pdg == pdg);
+      }
+      bool keep = ((include_matching_pdg && matched_pdg) ||
+                   (!include_matching_pdg && !matched_pdg));
+      if (!matched_pdg) {
+        continue;
+      }
+      selected_particles.push_back(part);
+    }
+  }
+  return selected_particles;
+}
+
+template <size_t N>
+Particle
+GetHMParticle(FullEvent const &ev, std::vector<PDG_t> const &pdgs,
+              Particle::Status_t status = Particle::Status_t::kNuclearLeaving,
+              bool include_matching_pdg = true) {
+  Particle HMParticle;
+  for (StatusParticles const &parts : ev.ParticleStack) {
+    if (parts.status != status) {
+      continue;
+    }
+    for (Particle const &part : parts.particles) {
+      bool matched_pdg = false;
+      for (pdg : pdgs) {
+        matched_pdg = matched_pdg || (part.pdg == pdg);
+      }
+      bool keep = ((include_matching_pdg && matched_pdg) ||
+                   (!include_matching_pdg && !matched_pdg));
+      if (!matched_pdg) {
+        continue;
+      }
+      if (part.P4.Vect().Mag() > HMParticle.P4.Vect().Mag()) {
+        HMParticle = part;
+      }
+    }
+  }
+  return HMParticle;
+}
+
+std::vector<Particle> GetFSChargedLeptons(FullEvent const &ev) {
+  return GetParticles(ev, pdgcodes::ChargedLeptons);
+}
+std::vector<Particle> GetFSNeutralLeptons(FullEvent const &ev) {
+  return GetParticles(ev, pdgcodes::NeutralLeptons);
+}
+std::vector<Particle> GetISNeutralLeptons(FullEvent const &ev) {
+  return GetParticles(ev, pdgcodes::NeutralLeptons,
+                      Particle::Status_t::kPrimaryInitialState);
+}
+std::vector<Particle> GetFSChargedPions(FullEvent const &ev) {
+  return GetParticles(ev, pdgcodes::ChargedPions);
+}
+std::vector<Particle> GetFSNeutralPions(FullEvent const &ev) {
+  return GetParticles(ev, pdgcodes::NeutralPions);
+}
+std::vector<Particle> GetFSPions(FullEvent const &ev) {
+  return GetParticles(ev, pdgcodes::Pions);
+}
+std::vector<Particle> GetFSProtons(FullEvent const &ev) {
+  return GetParticles(ev, pdgcodes::Protons);
+}
+std::vector<Particle> GetFSNeutrons(FullEvent const &ev) {
+  return GetParticles(ev, pdgcodes::Neutron);
+}
+std::vector<Particle> GetFSNucleons(FullEvent const &ev) {
+  return GetParticles(ev, pdgcodes::Nucleons);
+}
+std::vector<Particle> GetFSOthers(FullEvent const &ev) {
+  return GetParticles(ev, pdgcodes::CommonParticles,
+                      Particle::Status_t::kNuclearLeaving, false);
+}
+
+Particle GetFSChargedLepton(FullEvent const &ev) {
+  return GetHMParticle(ev, pdgcodes::ChargedLeptons);
+}
+Particle GetFSNeutralLepton(FullEvent const &ev) {
+  return GetHMParticle(ev, pdgcodes::NeutralLeptons);
+}
+Particle GetISNeutralLepton(FullEvent const &ev) {
+  return GetHMParticle(ev, pdgcodes::NeutralLeptons,
+                       Particle::Status_t::kPrimaryInitialState);
+}
+Particle GetFSChargedPion(FullEvent const &ev) {
+  return GetHMParticle(ev, pdgcodes::ChargedPions);
+}
+Particle GetFSNeutralPion(FullEvent const &ev) {
+  return GetHMParticle(ev, pdgcodes::NeutralPions);
+}
+Particle GetFSPion(FullEvent const &ev) {
+  return GetHMParticle(ev, pdgcodes::Pions);
+}
+Particle GetFSProton(FullEvent const &ev) {
+  return GetHMParticle(ev, pdgcodes::Protons);
+}
+Particle GetFSNeutron(FullEvent const &ev) {
+  return GetHMParticle(ev, pdgcodes::Neutron);
+}
+Particle GetFSNucleon(FullEvent const &ev) {
+  return GetHMParticle(ev, pdgcodes::Nucleons);
+}
+Particle GetFSOther(FullEvent const &ev) {
+  return GetHMParticle(ev, pdgcodes::CommonParticles,
+                       Particle::Status_t::kNuclearLeaving, false);
+}
+
+} // namespace utility
+} // namespace nuis
+
+#endif
diff --git a/src/utility/PDGCodeUtility.hxx b/src/utility/PDGCodeUtility.hxx
new file mode 100644
index 0000000..62cbd5e
--- /dev/null
+++ b/src/utility/PDGCodeUtility.hxx
@@ -0,0 +1,48 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef UTILITY_PDGCODEUTILITY_HXX_SEEN
+#define UTILITY_PDGCODEUTILITY_HXX_SEEN
+
+namespace nuis {
+namespace utility {
+namespace pdgcodes {
+static std::vector<PDG_t> const ChargedLeptons{11, 13, 15, -11, -13, -15};
+static std::vector<PDG_t> const ChargedLeptons_matter{11, 13, 15};
+static std::vector<PDG_t> const ChargedLeptons_antimatter{-11, -13, -15};
+
+static std::vector<PDG_t> const NeutralLeptons{12, 14, 16, -12, -14, -16};
+static std::vector<PDG_t> const NeutralLeptons_matter{12, 14, 16};
+static std::vector<PDG_t> const NeutralLeptons_antimatter{-12, -14, -16};
+
+static std::vector<PDG_t> const ChargedPions{211, -211};
+static std::vector<PDG_t> const NeutralPions{111};
+static std::vector<PDG_t> const Pions{211, -211, 111};
+static std::vector<PDG_t> const Protons{2212};
+static std::vector<PDG_t> const Neutron{2112};
+static std::vector<PDG_t> const Nucleons{2212, 2112};
+
+static std::vector<PDG_t> const CommonParticles{11,  13,   15,  -11,  -13, -15,
+                                                12,  14,   16,  -12,  -14, -16,
+                                                211, -211, 111, 2212, 2112};
+} // namespace pdgcodes
+} // namespace utility
+} // namespace nuis
+
+#endif
diff --git a/src/utility/ROOTUtility.hxx b/src/utility/ROOTUtility.hxx
new file mode 100644
index 0000000..a4e1511
--- /dev/null
+++ b/src/utility/ROOTUtility.hxx
@@ -0,0 +1,88 @@
+// Copyright 2018 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
+
+/*******************************************************************************
+ *    This file is part of NUISANCE.
+ *
+ *    NUISANCE is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    NUISANCE is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+
+#ifndef UTILITY_ROOTUTILITY_HXX_SEEN
+#define UTILITY_ROOTUTILITY_HXX_SEEN
+
+#include "TFile.h"
+#include "TTree.h"
+
+#include "exception/exception.hxx"
+
+#include <iomanip>
+#include <iostream>
+#include <memory>
+#include <string>
+
+namespace nuis {
+namespace utility {
+
+NEW_NUIS_EXCEPT(failed_to_open_TFile);
+NEW_NUIS_EXCEPT(failed_to_get_TTree);
+
+inline TFile *CheckOpenTFile(std::string const &fname, char const *opts="") {
+
+  TDirectory *ogDir = gDirectory;
+
+  TFile *inpF = new TFile(fname.c_str(), opts);
+  if (!inpF || !inpF->IsOpen()) {
+    throw failed_to_open_TFile()
+        << "[ERROR]: Couldn't open input file: " << std::quoted(fname);
+  }
+
+  if (ogDir) {
+    ogDir->cd();
+  }
+
+  return inpF;
+}
+
+struct TreeFile {
+  TFile *file;
+  TTree *tree;
+  TreeFile() : file(nullptr), tree(nullptr) {}
+  TreeFile(TreeFile const &other) = delete;
+  TreeFile(TreeFile &&other) : file(other.file), tree(other.tree) {
+    other.file = nullptr;
+    other.tree = nullptr;
+  }
+  ~TreeFile() {
+    if (file) {
+      file->Close();
+    }
+  }
+};
+
+inline std::unique_ptr<TreeFile> CheckGetTTree(std::string const &fname,
+                                               std::string const &tname) {
+  TreeFile tf;
+  tf.file = CheckOpenTFile(fname);
+  tf.tree = dynamic_cast<TTree *>(tf.file->Get(tname.c_str()));
+  if (!tf.tree) {
+    throw failed_to_get_TTree()
+        << "[ERROR]: Failed to get TTree named: " << std::quoted(tname)
+        << " from TFile: " << std::quoted(fname);
+  }
+  return std::make_unique<TreeFile>(std::move(tf));
+}
+
+} // namespace utility
+} // namespace nuis
+
+#endif