rename and move everything for consistency