Working on classification
Second commit to modulize
Modulize complete