Code organizational changes and added json input file system!