GEM, command-line options, restructuring