changed former admin class to extesion, service config
Merge branch 'admin-extension'