Cleaned up and moved repos upstream