I think that it is safe to say that the refactoring is officially done.