Removed a couple files and moved merge tool source files into the merge tool package