renaming some files for hierarchical reasons