Refactoring classes; adding tools.