Move into org.jboss.aerogear.connectivity.common package