Move common files to a common subdir
Fix file renaming command