rename and organize a bit