Removed testing classes, will replace them soon.
Splitted MatTools methods