Start working on a better remote directory format