Modified input file structure and reading

I modified the input file structure to use less files. The input data
are not distributed more consistently among the modules