Improved naming. Added VaoBuilder to replace EPHModel. Minor changes.