Add deprecation error when included the old way
Restructure strategies specs