Re structure

Args are now generic (proven to get better results). Tweaking so args
affect nothing, just output to 'Generic' files