Tidying up classes and packages