renamed main class
updated tools