Better organize remotes