Code Update and File Rename/Relocate

Made the tool more flexible in version 3