Refractor to net.ae97 as package