Cleaned up some unused classes and move ipv4 to domain