gl2: fix import paths; fix golint issues