Refactoring of topology class

Ready to implement BridgeDiscovery