Ignore bin
Add superclass, fix name