Refactoring, fixes for OMNeT 4.6/INET 2.5