Added a structure for a v2
moved files around to new structure