Classes update

Removed XyzClass and merged them with Xyz;
Got rid of some nasty macros;