Some refactoring to the project structure to enable optional add-ons (Specs2 integration etc.)