move Any classes so they are easier to specify
fix invalid classes, and simplify Any types