Removed v2 folder and namespace