Moving all includes from the .cpp to the .hpp in the strategy module, as required in #21
Replacing tabs for spaces