Let's make remotes separate

This allows things to be less cluttered and easily changable