Rename and cleanup directories