Move vapis to their own directory, add currently empty gir directory