Lots of new classes
Removed unrequired Strategy classes