Imported from opengles-book project
re-org