Revert "conflicts solved"

This reverts commit 8e71c3bbc1411329b8b363bdb71a57bfe0cf4beb.
Renamed algorithms to classification
Resolved import-problem