Vivo: Cleanup and move stuffs around