Added Extreme Planning
Fix structure