Rename and reorganize as git-subdir