rearranged some modules and defined new outpus formats