changes to run from same folder
additions and refactoring to make the tool more user friendly