Mega update

Decapitalize. Sorry, couldn't take it anymore.
Temporarily remove some of the less generic classes.