the storing in archive directory was non-standard solution => gets removed
also the code was simplified and clean up a bit