Add structure
 Fix requires