Fixed V1 and V2 confusion
Added include directories