fixed to make compile
moved files to be consitent with V1 and V2 directories