rename and move files for better reorganization