Move my files into a subdir so I can pull from upstream