More refactoring - rename classes etc