Put message generators into their own folder and fixed 3.0 compilation errors