refactoring

-analysis divided into different analysis types
-map classification methods in separate module