Move properties to the public header