Implemented upgraded directory generator

I implemented the data directory generator that i described in my
prevíous sync.

Now there is a single data directory generator, with incremental
numbering option,