-import org.wamblee.system.AbstractProvidedInterfaceDescriptor;
-import org.wamblee.system.AbstractProvidedInterfaceDescriptor;
-import org.wamblee.system.DefaultRequiredInterfaceDescriptor;
-import org.wamblee.system.DefaultServiceRegistry;
-import org.wamblee.system.ProvidedInterfaceDescriptor;
-import org.wamblee.system.RequiredInterfaceDescriptor;
-import org.wamblee.system.Service;
-import org.wamblee.system.InterfaceDescriptor;
-import org.wamblee.system.ServiceRegistry;
+import org.wamblee.system.DefaultProvidedInterface;
+import org.wamblee.system.DefaultRequiredInterface;
+import org.wamblee.system.ProvidedInterface;
+import org.wamblee.system.RequiredInterface;