add Class Finder Mojo
add functional stuff
fix after refactor