Moved mod class to base package (afm)