Work on classification

- classifier done, needs debug
- renamed test