Creation of stub classes and separation of old code