Next release will have new structure