edited with input from Theodoros
Before change about nGamma: will calculate only once in constructor
new output directory structure etc.