Move ajctr to separate module