Move into subdirectory, add v1 namespace