HomeHEPForge

some refactoring