Input file layout changed

Adapted the file readers to a more compact input file system