Usage of gl_generator instead of gl dependency. Moved folders