adding shader and Vertex structures; fix circular import