Revert algo class
Working on algo header
Rename base class; move ctor body to cc file