fixes and rename
mv