added v2 folder structure