Minor tidy-up, helped by Ninja IDE
Updating the code, following classes to their new home.
Adding a newline