added vim and moved things