Tidied up classes and includes.