Added core and gfx libraries