file moves and tweaks