updated names, and removed uneeded files