Revert "Reorganized vertex code - flawed build"

This reverts commit d98ad7476885d3aee26518bd29dbb43ddb8dee56.