Reorganization of Master class definition.

And minor fix (change vec2 for ivec2)
Reorganization of renderer class.

And proper initialization list, too.