organize dir and rename some files;