restruct directory and changing name