Adding a strategy component, also reshaped the project structure until things are more tightly locked down.