simplify a bit the pictures folder handling
preparing the terrain for sub-directories support, simplifying how the main code is called