Completely restructured the folder hierarchy for v2 but nothing else is done