Rewrite remotes

Everything should work now with the new files, in time everything will be rewritten to the new style.