Made changes to use output/input files as specified in the properties
file