Refactor class names

Maybe I'm just like my mother
She's never satisfied
Remove redundant goal (probably?) and unused dependency