Large amounts of refactoring, mainly in Admiral and related classes.