Made classifier more modular
Added short todo list