Refactoring
Refactoring (combining tools into one standalone jar); added tests