Moved strategies to proper location