Added and Integrated VertexData struct

Also changed position and colour to be vec4