Added proper package names so that AA will compile under eclipse.