Refactored Tools, split up classes