New structure to fit with new EbbRT repo