refactor objects structure for #52