feature #3175: Moved Nic and VM to new modules