Refactoring of extensions (now integrated with their classes)