Moved constructors to bottom of headers