Refactor for easier tool invocation and distribution
Update help