Feature/cleanup

Cleaned up some of the urls and tool names.