diff --git a/BTagTrainingPreprocessing/src/BTagJetWriterConfig.cxx b/BTagTrainingPreprocessing/src/config/BTagJetWriterConfig.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagJetWriterConfig.cxx
rename to BTagTrainingPreprocessing/src/config/BTagJetWriterConfig.cxx
diff --git a/BTagTrainingPreprocessing/src/BTagJetWriterConfig.hh b/BTagTrainingPreprocessing/src/config/BTagJetWriterConfig.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagJetWriterConfig.hh
rename to BTagTrainingPreprocessing/src/config/BTagJetWriterConfig.hh
diff --git a/BTagTrainingPreprocessing/src/BTagTrackWriterConfig.hh b/BTagTrainingPreprocessing/src/config/BTagTrackWriterConfig.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagTrackWriterConfig.hh
rename to BTagTrainingPreprocessing/src/config/BTagTrackWriterConfig.hh
diff --git a/BTagTrainingPreprocessing/src/ConfigFileTools.cxx b/BTagTrainingPreprocessing/src/config/ConfigFileTools.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/ConfigFileTools.cxx
rename to BTagTrainingPreprocessing/src/config/ConfigFileTools.cxx
diff --git a/BTagTrainingPreprocessing/src/ConfigFileTools.hh b/BTagTrainingPreprocessing/src/config/ConfigFileTools.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/ConfigFileTools.hh
rename to BTagTrainingPreprocessing/src/config/ConfigFileTools.hh
diff --git a/BTagTrainingPreprocessing/src/DL2Config.hh b/BTagTrainingPreprocessing/src/config/DL2Config.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/DL2Config.hh
rename to BTagTrainingPreprocessing/src/config/DL2Config.hh
diff --git a/BTagTrainingPreprocessing/src/FatJetWriterConfig.cxx b/BTagTrainingPreprocessing/src/config/FatJetWriterConfig.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/FatJetWriterConfig.cxx
rename to BTagTrainingPreprocessing/src/config/FatJetWriterConfig.cxx
diff --git a/BTagTrainingPreprocessing/src/FatJetWriterConfig.hh b/BTagTrainingPreprocessing/src/config/FatJetWriterConfig.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/FatJetWriterConfig.hh
rename to BTagTrainingPreprocessing/src/config/FatJetWriterConfig.hh
diff --git a/BTagTrainingPreprocessing/src/HitWriterConfig.hh b/BTagTrainingPreprocessing/src/config/HitWriterConfig.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/HitWriterConfig.hh
rename to BTagTrainingPreprocessing/src/config/HitWriterConfig.hh
diff --git a/BTagTrainingPreprocessing/src/JetConstWriterConfig.hh b/BTagTrainingPreprocessing/src/config/JetConstWriterConfig.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/JetConstWriterConfig.hh
rename to BTagTrainingPreprocessing/src/config/JetConstWriterConfig.hh
diff --git a/BTagTrainingPreprocessing/src/SingleBTagConfig.cxx b/BTagTrainingPreprocessing/src/config/SingleBTagConfig.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/SingleBTagConfig.cxx
rename to BTagTrainingPreprocessing/src/config/SingleBTagConfig.cxx
diff --git a/BTagTrainingPreprocessing/src/SingleBTagConfig.hh b/BTagTrainingPreprocessing/src/config/SingleBTagConfig.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/SingleBTagConfig.hh
rename to BTagTrainingPreprocessing/src/config/SingleBTagConfig.hh
diff --git a/BTagTrainingPreprocessing/src/DecoratorExample.cxx b/BTagTrainingPreprocessing/src/decorators/DecoratorExample.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/DecoratorExample.cxx
rename to BTagTrainingPreprocessing/src/decorators/DecoratorExample.cxx
diff --git a/BTagTrainingPreprocessing/src/DecoratorExample.hh b/BTagTrainingPreprocessing/src/decorators/DecoratorExample.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/DecoratorExample.hh
rename to BTagTrainingPreprocessing/src/decorators/DecoratorExample.hh
diff --git a/BTagTrainingPreprocessing/src/HitDecorator.cxx b/BTagTrainingPreprocessing/src/decorators/HitDecorator.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/HitDecorator.cxx
rename to BTagTrainingPreprocessing/src/decorators/HitDecorator.cxx
diff --git a/BTagTrainingPreprocessing/src/HitDecorator.hh b/BTagTrainingPreprocessing/src/decorators/HitDecorator.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/HitDecorator.hh
rename to BTagTrainingPreprocessing/src/decorators/HitDecorator.hh
diff --git a/BTagTrainingPreprocessing/src/JetTruthDecorator.cxx b/BTagTrainingPreprocessing/src/decorators/JetTruthDecorator.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/JetTruthDecorator.cxx
rename to BTagTrainingPreprocessing/src/decorators/JetTruthDecorator.cxx
diff --git a/BTagTrainingPreprocessing/src/JetTruthDecorator.hh b/BTagTrainingPreprocessing/src/decorators/JetTruthDecorator.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/JetTruthDecorator.hh
rename to BTagTrainingPreprocessing/src/decorators/JetTruthDecorator.hh
diff --git a/BTagTrainingPreprocessing/src/TrackAmbiDecorator.cxx b/BTagTrainingPreprocessing/src/decorators/TrackAmbiDecorator.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackAmbiDecorator.cxx
rename to BTagTrainingPreprocessing/src/decorators/TrackAmbiDecorator.cxx
diff --git a/BTagTrainingPreprocessing/src/TrackAmbiDecorator.hh b/BTagTrainingPreprocessing/src/decorators/TrackAmbiDecorator.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackAmbiDecorator.hh
rename to BTagTrainingPreprocessing/src/decorators/TrackAmbiDecorator.hh
diff --git a/BTagTrainingPreprocessing/src/TrackDecoratorExample.cxx b/BTagTrainingPreprocessing/src/decorators/TrackDecoratorExample.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackDecoratorExample.cxx
rename to BTagTrainingPreprocessing/src/decorators/TrackDecoratorExample.cxx
diff --git a/BTagTrainingPreprocessing/src/TrackDecoratorExample.hh b/BTagTrainingPreprocessing/src/decorators/TrackDecoratorExample.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackDecoratorExample.hh
rename to BTagTrainingPreprocessing/src/decorators/TrackDecoratorExample.hh
diff --git a/BTagTrainingPreprocessing/src/TrackTruthDecorator.cxx b/BTagTrainingPreprocessing/src/decorators/TrackTruthDecorator.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackTruthDecorator.cxx
rename to BTagTrainingPreprocessing/src/decorators/TrackTruthDecorator.cxx
diff --git a/BTagTrainingPreprocessing/src/TrackTruthDecorator.hh b/BTagTrainingPreprocessing/src/decorators/TrackTruthDecorator.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackTruthDecorator.hh
rename to BTagTrainingPreprocessing/src/decorators/TrackTruthDecorator.hh
diff --git a/BTagTrainingPreprocessing/src/TrackVertexDecorator.cxx b/BTagTrainingPreprocessing/src/decorators/TrackVertexDecorator.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackVertexDecorator.cxx
rename to BTagTrainingPreprocessing/src/decorators/TrackVertexDecorator.cxx
diff --git a/BTagTrainingPreprocessing/src/TrackVertexDecorator.hh b/BTagTrainingPreprocessing/src/decorators/TrackVertexDecorator.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackVertexDecorator.hh
rename to BTagTrainingPreprocessing/src/decorators/TrackVertexDecorator.hh
diff --git a/BTagTrainingPreprocessing/src/ConstituentSelector.cxx b/BTagTrainingPreprocessing/src/selection/ConstituentSelector.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/ConstituentSelector.cxx
rename to BTagTrainingPreprocessing/src/selection/ConstituentSelector.cxx
diff --git a/BTagTrainingPreprocessing/src/ConstituentSelector.hh b/BTagTrainingPreprocessing/src/selection/ConstituentSelector.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/ConstituentSelector.hh
rename to BTagTrainingPreprocessing/src/selection/ConstituentSelector.hh
diff --git a/BTagTrainingPreprocessing/src/TrackSelector.cxx b/BTagTrainingPreprocessing/src/selection/TrackSelector.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackSelector.cxx
rename to BTagTrainingPreprocessing/src/selection/TrackSelector.cxx
diff --git a/BTagTrainingPreprocessing/src/TrackSelector.hh b/BTagTrainingPreprocessing/src/selection/TrackSelector.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackSelector.hh
rename to BTagTrainingPreprocessing/src/selection/TrackSelector.hh
diff --git a/BTagTrainingPreprocessing/src/TrackSelectorConfig.hh b/BTagTrainingPreprocessing/src/selection/TrackSelectorConfig.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackSelectorConfig.hh
rename to BTagTrainingPreprocessing/src/selection/TrackSelectorConfig.hh
diff --git a/BTagTrainingPreprocessing/src/TrackSortOrder.hh b/BTagTrainingPreprocessing/src/selection/TrackSortOrder.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TrackSortOrder.hh
rename to BTagTrainingPreprocessing/src/selection/TrackSortOrder.hh
diff --git a/BTagTrainingPreprocessing/src/TruthSelectorConfig.hh b/BTagTrainingPreprocessing/src/selection/TruthSelectorConfig.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TruthSelectorConfig.hh
rename to BTagTrainingPreprocessing/src/selection/TruthSelectorConfig.hh
diff --git a/BTagTrainingPreprocessing/src/TruthTools.cxx b/BTagTrainingPreprocessing/src/selection/TruthTools.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/TruthTools.cxx
rename to BTagTrainingPreprocessing/src/selection/TruthTools.cxx
diff --git a/BTagTrainingPreprocessing/src/TruthTools.hh b/BTagTrainingPreprocessing/src/selection/TruthTools.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TruthTools.hh
rename to BTagTrainingPreprocessing/src/selection/TruthTools.hh
diff --git a/BTagTrainingPreprocessing/src/trackSort.cxx b/BTagTrainingPreprocessing/src/selection/trackSort.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/trackSort.cxx
rename to BTagTrainingPreprocessing/src/selection/trackSort.cxx
diff --git a/BTagTrainingPreprocessing/src/trackSort.hh b/BTagTrainingPreprocessing/src/selection/trackSort.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/trackSort.hh
rename to BTagTrainingPreprocessing/src/selection/trackSort.hh
diff --git a/BTagTrainingPreprocessing/src/BJetShallowCopier.cxx b/BTagTrainingPreprocessing/src/tools/BJetShallowCopier.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/BJetShallowCopier.cxx
rename to BTagTrainingPreprocessing/src/tools/BJetShallowCopier.cxx
diff --git a/BTagTrainingPreprocessing/src/BJetShallowCopier.hh b/BTagTrainingPreprocessing/src/tools/BJetShallowCopier.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/BJetShallowCopier.hh
rename to BTagTrainingPreprocessing/src/tools/BJetShallowCopier.hh
diff --git a/BTagTrainingPreprocessing/src/BTagInputChecker.cxx b/BTagTrainingPreprocessing/src/tools/BTagInputChecker.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagInputChecker.cxx
rename to BTagTrainingPreprocessing/src/tools/BTagInputChecker.cxx
diff --git a/BTagTrainingPreprocessing/src/BTagInputChecker.hh b/BTagTrainingPreprocessing/src/tools/BTagInputChecker.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagInputChecker.hh
rename to BTagTrainingPreprocessing/src/tools/BTagInputChecker.hh
diff --git a/BTagTrainingPreprocessing/src/BTagTrainingPreprocessingDict.h b/BTagTrainingPreprocessing/src/tools/BTagTrainingPreprocessingDict.h
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagTrainingPreprocessingDict.h
rename to BTagTrainingPreprocessing/src/tools/BTagTrainingPreprocessingDict.h
diff --git a/BTagTrainingPreprocessing/src/SafeShallowCopy.hh b/BTagTrainingPreprocessing/src/tools/SafeShallowCopy.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/SafeShallowCopy.hh
rename to BTagTrainingPreprocessing/src/tools/SafeShallowCopy.hh
diff --git a/BTagTrainingPreprocessing/src/SingleBTagTools.cxx b/BTagTrainingPreprocessing/src/tools/SingleBTagTools.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/SingleBTagTools.cxx
rename to BTagTrainingPreprocessing/src/tools/SingleBTagTools.cxx
diff --git a/BTagTrainingPreprocessing/src/SingleBTagTools.hh b/BTagTrainingPreprocessing/src/tools/SingleBTagTools.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/SingleBTagTools.hh
rename to BTagTrainingPreprocessing/src/tools/SingleBTagTools.hh
diff --git a/BTagTrainingPreprocessing/src/SubstructureAccessors.cxx b/BTagTrainingPreprocessing/src/tools/SubstructureAccessors.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/SubstructureAccessors.cxx
rename to BTagTrainingPreprocessing/src/tools/SubstructureAccessors.cxx
diff --git a/BTagTrainingPreprocessing/src/SubstructureAccessors.hh b/BTagTrainingPreprocessing/src/tools/SubstructureAccessors.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/SubstructureAccessors.hh
rename to BTagTrainingPreprocessing/src/tools/SubstructureAccessors.hh
diff --git a/BTagTrainingPreprocessing/src/TriggerBTagMatcherAlg.cxx b/BTagTrainingPreprocessing/src/tools/TriggerBTagMatcherAlg.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/TriggerBTagMatcherAlg.cxx
rename to BTagTrainingPreprocessing/src/tools/TriggerBTagMatcherAlg.cxx
diff --git a/BTagTrainingPreprocessing/src/TriggerBTagMatcherAlg.h b/BTagTrainingPreprocessing/src/tools/TriggerBTagMatcherAlg.h
similarity index 100%
rename from BTagTrainingPreprocessing/src/TriggerBTagMatcherAlg.h
rename to BTagTrainingPreprocessing/src/tools/TriggerBTagMatcherAlg.h
diff --git a/BTagTrainingPreprocessing/src/TriggerJetGetterAlg.cxx b/BTagTrainingPreprocessing/src/tools/TriggerJetGetterAlg.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/TriggerJetGetterAlg.cxx
rename to BTagTrainingPreprocessing/src/tools/TriggerJetGetterAlg.cxx
diff --git a/BTagTrainingPreprocessing/src/TriggerJetGetterAlg.h b/BTagTrainingPreprocessing/src/tools/TriggerJetGetterAlg.h
similarity index 100%
rename from BTagTrainingPreprocessing/src/TriggerJetGetterAlg.h
rename to BTagTrainingPreprocessing/src/tools/TriggerJetGetterAlg.h
diff --git a/BTagTrainingPreprocessing/src/TruthCorruptionCounter.cxx b/BTagTrainingPreprocessing/src/tools/TruthCorruptionCounter.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/TruthCorruptionCounter.cxx
rename to BTagTrainingPreprocessing/src/tools/TruthCorruptionCounter.cxx
diff --git a/BTagTrainingPreprocessing/src/TruthCorruptionCounter.hh b/BTagTrainingPreprocessing/src/tools/TruthCorruptionCounter.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TruthCorruptionCounter.hh
rename to BTagTrainingPreprocessing/src/tools/TruthCorruptionCounter.hh
diff --git a/BTagTrainingPreprocessing/src/addMetadata.cxx b/BTagTrainingPreprocessing/src/tools/addMetadata.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/addMetadata.cxx
rename to BTagTrainingPreprocessing/src/tools/addMetadata.cxx
diff --git a/BTagTrainingPreprocessing/src/addMetadata.hh b/BTagTrainingPreprocessing/src/tools/addMetadata.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/addMetadata.hh
rename to BTagTrainingPreprocessing/src/tools/addMetadata.hh
diff --git a/BTagTrainingPreprocessing/src/errorLogger.cxx b/BTagTrainingPreprocessing/src/tools/errorLogger.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/errorLogger.cxx
rename to BTagTrainingPreprocessing/src/tools/errorLogger.cxx
diff --git a/BTagTrainingPreprocessing/src/errorLogger.hh b/BTagTrainingPreprocessing/src/tools/errorLogger.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/errorLogger.hh
rename to BTagTrainingPreprocessing/src/tools/errorLogger.hh
diff --git a/BTagTrainingPreprocessing/src/streamers.cxx b/BTagTrainingPreprocessing/src/tools/streamers.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/streamers.cxx
rename to BTagTrainingPreprocessing/src/tools/streamers.cxx
diff --git a/BTagTrainingPreprocessing/src/streamers.hh b/BTagTrainingPreprocessing/src/tools/streamers.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/streamers.hh
rename to BTagTrainingPreprocessing/src/tools/streamers.hh
diff --git a/BTagTrainingPreprocessing/src/BTagJetWriter.cxx b/BTagTrainingPreprocessing/src/writers/BTagJetWriter.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagJetWriter.cxx
rename to BTagTrainingPreprocessing/src/writers/BTagJetWriter.cxx
diff --git a/BTagTrainingPreprocessing/src/BTagJetWriter.hh b/BTagTrainingPreprocessing/src/writers/BTagJetWriter.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagJetWriter.hh
rename to BTagTrainingPreprocessing/src/writers/BTagJetWriter.hh
diff --git a/BTagTrainingPreprocessing/src/BTagJetWriterUtils.cxx b/BTagTrainingPreprocessing/src/writers/BTagJetWriterUtils.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagJetWriterUtils.cxx
rename to BTagTrainingPreprocessing/src/writers/BTagJetWriterUtils.cxx
diff --git a/BTagTrainingPreprocessing/src/BTagJetWriterUtils.hh b/BTagTrainingPreprocessing/src/writers/BTagJetWriterUtils.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagJetWriterUtils.hh
rename to BTagTrainingPreprocessing/src/writers/BTagJetWriterUtils.hh
diff --git a/BTagTrainingPreprocessing/src/BTagTrackWriter.cxx b/BTagTrainingPreprocessing/src/writers/BTagTrackWriter.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagTrackWriter.cxx
rename to BTagTrainingPreprocessing/src/writers/BTagTrackWriter.cxx
diff --git a/BTagTrainingPreprocessing/src/BTagTrackWriter.hh b/BTagTrainingPreprocessing/src/writers/BTagTrackWriter.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/BTagTrackWriter.hh
rename to BTagTrainingPreprocessing/src/writers/BTagTrackWriter.hh
diff --git a/BTagTrainingPreprocessing/src/FatJetWriter.cxx b/BTagTrainingPreprocessing/src/writers/FatJetWriter.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/FatJetWriter.cxx
rename to BTagTrainingPreprocessing/src/writers/FatJetWriter.cxx
diff --git a/BTagTrainingPreprocessing/src/FatJetWriter.hh b/BTagTrainingPreprocessing/src/writers/FatJetWriter.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/FatJetWriter.hh
rename to BTagTrainingPreprocessing/src/writers/FatJetWriter.hh
diff --git a/BTagTrainingPreprocessing/src/HitWriter.cxx b/BTagTrainingPreprocessing/src/writers/HitWriter.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/HitWriter.cxx
rename to BTagTrainingPreprocessing/src/writers/HitWriter.cxx
diff --git a/BTagTrainingPreprocessing/src/HitWriter.hh b/BTagTrainingPreprocessing/src/writers/HitWriter.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/HitWriter.hh
rename to BTagTrainingPreprocessing/src/writers/HitWriter.hh
diff --git a/BTagTrainingPreprocessing/src/JetConstWriter.cxx b/BTagTrainingPreprocessing/src/writers/JetConstWriter.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/JetConstWriter.cxx
rename to BTagTrainingPreprocessing/src/writers/JetConstWriter.cxx
diff --git a/BTagTrainingPreprocessing/src/JetConstWriter.hh b/BTagTrainingPreprocessing/src/writers/JetConstWriter.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/JetConstWriter.hh
rename to BTagTrainingPreprocessing/src/writers/JetConstWriter.hh
diff --git a/BTagTrainingPreprocessing/src/SubjetWriter.cxx b/BTagTrainingPreprocessing/src/writers/SubjetWriter.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/SubjetWriter.cxx
rename to BTagTrainingPreprocessing/src/writers/SubjetWriter.cxx
diff --git a/BTagTrainingPreprocessing/src/SubjetWriter.hh b/BTagTrainingPreprocessing/src/writers/SubjetWriter.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/SubjetWriter.hh
rename to BTagTrainingPreprocessing/src/writers/SubjetWriter.hh
diff --git a/BTagTrainingPreprocessing/src/TruthWriter.cxx b/BTagTrainingPreprocessing/src/writers/TruthWriter.cxx
similarity index 100%
rename from BTagTrainingPreprocessing/src/TruthWriter.cxx
rename to BTagTrainingPreprocessing/src/writers/TruthWriter.cxx
diff --git a/BTagTrainingPreprocessing/src/TruthWriter.hh b/BTagTrainingPreprocessing/src/writers/TruthWriter.hh
similarity index 100%
rename from BTagTrainingPreprocessing/src/TruthWriter.hh
rename to BTagTrainingPreprocessing/src/writers/TruthWriter.hh