Extract constructors to their own files