restructuring of the output, README to be updated soon