Reorganized input file