rename and re-struct